[Svnmerge] [PATCH] Bidirectional merging patch for svnmerge.py

[Giovanni Bajo]

Raman Gupta <rocketraman at fastmail.fm> wrote:

>> Attached is a bidirectional merging patch for the latest version of
>> svnmerge.py (rev 238).

I forgot: you should also try and provide a testcase for this. svnmerge's
testsuite is not very handy to use and it's still missing tests for
block/unblock, but it's still better than nothing and I'd like svnmerge not to
grow untested options.

Thanks!
Giovanni Bajo