--- 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