Python implementation of hgmerge

Arve Knudsen arve.knudsen at gmail.com
Wed Jul 25 15:07:16 CDT 2007


Hello
It was suggested in #mercurial that I made it known on the mailing list that
I've implemented a simple version (unfinished in terms of functionality) of
hgmerge in cross-platform Python. I've uploaded the script with unit tests
to the original issue in the bug tracker,
http://www.selenic.com/mercurial/bts/issue52. The script currently supports
only the merge tools diff3 and kdiff3 (which were relevant to me), but
through augmenting the set of unit tests it should be relatively easy to add
support for other tools as well. I've verified the script to work on Ubuntu
Feisty and Windows XP. Looking forward to any feedback/suggestions :]

Best regards,
Arve Knudsen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial-devel/attachments/20070725/3a080021/attachment.htm 


More information about the Mercurial-devel mailing list