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

[Raman Gupta]

Ok, I see from recent emails it seems we have new maintainers for
svnmerge.py... any chance you could review the following pending patch:

http://tinyurl.com/3c229c

There was lots of discussion about it, but IMHO never any good reasons
to not commit it. See this email (which never got a response):

http://tinyurl.com/39h6x5

Cheers,
Raman Gupta