-
Committer:
exarkun
-
Date:
2009-11-25 18:48:46 UTC
-
Revision ID:
svn-v4:866e43f7-fbfc-0310-8f2a-ec88d1da2979:trunk:17847
Merge combinator-non-interactive-merge-2984
Author: exarkun
Reviewer: faldridge
Fixes: #2984
Add the --non-interactive flag to the svn merge command to avoid the new
interactive merging behavior in subversion 1.6.