# HG changeset patch # User Oleksandr Gavenko # Date 1295442642 -7200 # Node ID 001f5498a085896f7c3f87273f61fb64e23863b8 # Parent 67a292e6d70bf4df4e052bf0921292b945ed252b Add header for 'interactive-conflicts' option. diff -r 67a292e6d70b -r 001f5498a085 svn.rst --- a/svn.rst Wed Jan 19 15:10:07 2011 +0200 +++ b/svn.rst Wed Jan 19 15:10:42 2011 +0200 @@ -23,6 +23,7 @@ Write in '$HOME/.subversion/config' + [miscellany] interactive-conflicts = no * Creating svn repo.