# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1264336431 -7200
# Node ID 8914938042d474bdd6bb8326c92da47ec42f2a6d
# Parent  86fb7c1159d65cda298c1a8ccf94100bc3fecd07
Disable interactive conflict resolution.

diff -r 86fb7c1159d6 -r 8914938042d4 svn.rst
--- a/svn.rst	Sun Jan 24 14:32:23 2010 +0200
+++ b/svn.rst	Sun Jan 24 14:33:51 2010 +0200
@@ -3,7 +3,7 @@
 * Where palced config files?
 
 The per-user configuration area currently contains three files—two
-configuration files (config and servers).
+configuration files ('config' and 'servers').
 
   /etc/subversion
                 Unix system wide configurations.
@@ -18,3 +18,9 @@
   $ svnsync init https://PROJ.googlecode.com/svn https://PROJ.svn.sourceforge.net/svnroot/PROJ
   $ svnsync --username NAME --password PASSWORD \
                 sync https://PROJ.googlecode.com/svn https://PROJ.svn.sourceforge.net/svnroot/PROJ
+
+* Disable interactive conflict resolution.
+
+Write in '$HOME/.subversion/config'
+
+  interactive-conflicts = no