Menu

Commit [r3023]  Maximize  Restore  History

* src/en/book/ch02-basic-usage.xml

- updated output of interactive conflict resolution
* src/en/book/ch09-reference.xml
- updated valid values for the accept option.

Patch by: Karl Heinz Marbaise <khmarbaise {at} gmx.de>

cmpilato 2008-04-01

changed /trunk/src/en/book/ch02-basic-usage.xml
changed /trunk/src/en/book/ch09-reference.xml
/trunk/src/en/book/ch02-basic-usage.xml Diff Switch to side-by-side view
Loading...
/trunk/src/en/book/ch09-reference.xml Diff Switch to side-by-side view
Loading...