diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/server/plugins/version/svn.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt index d0c5c2317..206b193c3 100644 --- a/doc/server/plugins/version/svn.txt +++ b/doc/server/plugins/version/svn.txt @@ -49,7 +49,7 @@ The possible values of ``conflict_resolution`` are: * ``postpone`` (default) * ``mine-conflict`` * ``theirs-conflict`` -* ``mine-full` +* ``mine-full`` * ``theirs-full`` The other possible SVN conflict resolvers (``edit``, ``launch``, |