On Mon, Jul 23, 2012 at 08:45:47AM -0400, Jim Jagielski wrote: > I for sure don't use 'svn merge' and am likely guilty (and the > orig post clearly indicates) of this... For awhile, svn merge > was as wonky as hell, so I simply skipped using it and instead > used the svn.merge script which, for the curious, does a simple > diff and patch.
The one I use at http://people.apache.org/~jorton/svn.merge does use "svn merge" correctly (I hope!), possibly an older version didn't? Regards, Joe