[asterisk-dev] Subversion 1.5 and svnmerge tip

[Kevin P. Fleming]

If you are using Subversion 1.5 and the svnmerge script, you will want
to put 'interactive-conflicts = no' in the 'miscellany' section of your
~/.subversion/config file, otherwise you will find svnmerge operations
inexplicably 'hung'.

-- 
Kevin P. Fleming
Director of Software Technologies
Digium, Inc. - "The Genuine Asterisk Experience" (TM)