New 'mergediff' Extension

David Wolever wolever.lists at gmail.com
Mon May 24 02:46:53 UTC 2010


Hey,
I'd like to let everyone here know about an extension I've been  
working on: mergediff.

Its purpose is to show all the changes that have been introduced in a  
merge revision. For example, the mergediff of a clean merge will be  
empty and the mergediff of a dirty merge will show how conflicts were  
resolved.

There are some examples, an FAQ and a description of the algorithm on  
the wiki, here:
     http://mercurial.selenic.com/wiki/MergediffExtension

And the code can be found here:
     http://bitbucket.org/wolever/hg-mergediff/src

David

PS: Thanks a lot to djc for his help getting started



More information about the Mercurial mailing list