Re: svn commit: r1075802 - in /subversion/trunk/subversion: libsvn_client/merge.c libsvn_wc/merge.c tests/cmdline/merge_tests.py

[Daniel Shahaf]

Philip Martin wrote on Fri, Mar 04, 2011 at 11:22:37 +0000:
> It's long standing behaviour that removing the left/right files is one
> way to resolve a conflict.

/me learnt something new