From 3ee3158d866170f911c2b6834f54137d13e58aa7 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 4 Dec 2012 09:33:06 -0600
Subject: Svn: cleaned up conflict resolution stuff

---
 doc/server/plugins/version/svn.txt | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

(limited to 'doc')

diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt
index f7739bd51..d0c5c2317 100644
--- a/doc/server/plugins/version/svn.txt
+++ b/doc/server/plugins/version/svn.txt
@@ -36,29 +36,24 @@ Simply add Svn to your plugins line in ``/etc/bcfg2.conf``::
 Resolving conflicts
 =======================
 
-By default, the Svn plugin does not attempt to resolve conflicts 
+By default, the Svn plugin does not attempt to resolve conflicts
 when trying to commit or update the repository. This can be changed by
-adding to ``/etc/bcfg2.conf``::
-
-    [Svn]
-    conflict_resolution = 
-
-+-----------------+
-| Actions         |
-+=================+
-| base            |
-+-----------------+
-| postpone        |
-+-----------------+
-| mine-conflict   |
-+-----------------+
-| theirs-conflict |
-+-----------------+
-| mine-full       |
-+-----------------+
-| theirs-full     |
-+-----------------+
+adding to ``/etc/bcfg2.conf``, e.g.::
 
+    [svn]
+    conflict_resolution = theirs-conflict
+
+The possible values of ``conflict_resolution`` are:
+
+* ``base``
+* ``postpone`` (default)
+* ``mine-conflict``
+* ``theirs-conflict``
+* ``mine-full`
+* ``theirs-full``
+
+The other possible SVN conflict resolvers (``edit``, ``launch``,
+``working``) require manual intervention and so are not possible.
 Descriptions of each action can be found in the `Version Control with
 Subversion`_ book.
 
-- 
cgit v1.2.3-1-g7c22