Version Control With Subversion Source

The official documentation of the Subversion version control system

Brought to you by: cmpilato, danielshahaf

* en/book/ch09-reference.xml

Document the 'mine-conflict' and 'theirs-conflict' arguments to 'svn
resolve --accept'.

Authored by: cmpilato@gmail.com 2011-11-10

Parent: [r4193]

changed