* contrib/client-side/svn-hgmerge.py: New file, wraps Mercurial's hgmerge     script for use with the interactive conflict resolution system.
* contrib/client-side/svn-hgmerge.py: New file, wraps Mercurial's hgmerge
    script for use with the interactive conflict resolution system.

Patch by: Augie Fackler <durin42@gmail.com>


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@868180 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion