[Svnmerge] Conflicts on the svnmerge-integrated property

[Raman Gupta]

golan davidovits wrote:
> Hello,
> 
> Thanks for all the replies about the maual change post merge situation.
> I'm trying to work with svnmerge script in merges between trunk and my private branch
> but I'm getting conflicts on the svnmerge-integrated property in each merge.
> 
> What causes this behavior? 

Discussion is occurring right now on a separate thread about a patch
that will probably resolve this...

Cheers,
Raman