[Svnmerge] Pending patch to handle svnmerge-integrated property conflicts

[Raman Gupta]

Piet-Hein Peeters wrote:
> Hello Raman,
> 
> How about simular conflicts on the svnmerge-blocked property?
> Is that also fixed already? I raised that issue March 29 already, but
> I'm still waiting for the solution.

To tell you the truth I was under the impression that any patches
submitted wouldn't be committed anyway... since that may change in the
near future I might take another look as soon as I have a spare few
minutes.

A test case for your problem (as was previously discussed in another
thread) would certainly make it easier...

Cheers,
Raman Gupta