Version Control With Subversion Source

The official documentation of the Subversion version control system

Brought to you by: cmpilato, danielshahaf

Commit [r3914] Maximize Restore History

Finish Issue #130 ("1.6 change: improved interactive conflict

resolution").

* src/en/book/ch02-basic-usage.xml
Update conflict resolution prompts in example output. Document the
mine-conflict, theirs-conflict, and display-conflicts options.

* src/en/book/ch04-branching-and-merging.xml
Update conflict resolution prompts in example output.

* src/en/book/ch09-reference.xml
Update conflict resolution prompts in example output.

Authored by: cmpilato@gmail.com 2011-07-19

Browse code at this revision

Parent: [r3913]

Child: [r3915]

changed	/trunk/src/en/book/ch02-basic-usage.xml
changed	/trunk/src/en/book/ch04-branching-and-merging.xml
changed	/trunk/src/en/book/ch09-reference.xml

Version Control With Subversion Source

The official documentation of the Subversion version control system

Commit [r3914] Maximize Restore History

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

/trunk/src/en/book/ch04-branching-and-merging.xml Diff Switch to side-by-side view

/trunk/src/en/book/ch09-reference.xml Diff Switch to side-by-side view