hg-mergediff /

Filename Size Date modified Message
127 B
Adding a script which will build a test repository.
639 B
Cleaning up a bit of documentation and stuff.
12.1 KB
Update for compatibility with Mercurial 2.1.1
3.6 KB
Applying singpolyma's mktestrepo patch.

mergediff

Show the changes introduced by a merge.

Hacking/Testing

Use the mktestrepo script to build a test repository. It has tags a, b and merge, which can be used for generating diffs. For example:

$./mktestrepo ... test repo is built ...$ hg mergediff -r merge

Additionally, the debuglistmerges command, added by mergediff.py, can be used to list all the merge revisions in a repository. For example:

$for mergerev in hg debuglistmerges; do > hg mergediff -r$mergerev > done