hg-mergediff /

Filename Size Date modified Message
127 B
639 B
12.1 KB
3.6 KB

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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.