Bug#451503: subversion: Incorrect mentioning of conflicts

[Peter Samuelson]

[ron at ttvavanti.nl]
> After a merge I often find these kinds of conflicts in a file:
> 
> <<<<<<< .working
> 
> =======
> 
> >>>>>>> .merge-right.r15781
> 
> Obviously, both are empty lines and there's no need to create a conflict
> over this. I don't know how svn compares but I think adding a simple
> regex check like /^\w*$/ would solve this.

Does it help to use 'svn merge -x-b' or 'svn merge -x-w'?  Those flags
tell it to assume that whitespace changes are not significant.  See
'svn merge --help' for details.
-- 
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/