Checkout
Julian Foad
committed
on 01 Aug 03
Follow-up to r6597:

* doc/book/book/ch03.xml, doc/book/book/ch06.xml, doc/book/book/ch08.xml
* doc/book/book/appa.xml, doc/book/outline.txt… Show more
Follow-up to r6597:

* doc/book/book/ch03.xml, doc/book/book/ch06.xml, doc/book/book/ch08.xml

* doc/book/book/appa.xml, doc/book/outline.txt

* doc/translations/french/client.texi, doc/user/svn-ref.tex

* tools/client-side/psvn/psvn.el, tools/client-side/vc-svn.el

 The command is "resolved" now, not "resolve".

* subversion/include/svn_wc.h

* subversion/libsvn_wc/adm_crawler.c

* subversion/libsvn_wc/adm_ops.c

* subversion/libsvn_client/resolved.c

 (svn_wc_resolved_conflict) Replaces svn_wc_resolve_conflict.

Show less