diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/server/plugins/version/svn.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt index 748dce7c6..f7739bd51 100644 --- a/doc/server/plugins/version/svn.txt +++ b/doc/server/plugins/version/svn.txt @@ -44,10 +44,12 @@ adding to ``/etc/bcfg2.conf``:: conflict_resolution = +-----------------+ -| Attribute | +| Actions | +=================+ | base | +-----------------+ +| postpone | ++-----------------+ | mine-conflict | +-----------------+ | theirs-conflict | @@ -57,3 +59,9 @@ adding to ``/etc/bcfg2.conf``:: | theirs-full | +-----------------+ +Descriptions of each action can be found in the `Version Control with +Subversion`_ book. + +.. _Version Control with Subversion: +http://svnbook.red-bean.com/en/1.7/svn.ref.svn.html#svn.ref.svn.sw.accept + |