to the path of this script (see example in included sample.hgrc file).
Some use cases are not handled well by classic merge tools, which display panels
with the different versions of the file to merge (the common base, the newer
shows you a translated French file in one panel and the newer English page in
another panel, you cannot easily see what are the changes made in the English
page: the whole page is different! To fix this, I wrote this simple script that
-displays the diff of the original file alongside the translated file. It lets
-you see directly the changes made upstream and apply them as appropriate to your
+displays the diff of the original file alongside the translated file (its name
+means display-diff-merge-tool). It lets you see directly the changes made
+upstream and apply them as appropriate to your translated version.
To use this script as merge tool, first you should register it in the
merge-tools section of your .hgrc file (see example in included sample.hgrc
file), and then you can enable it on the command line:
- $ hg merge default --tool
+ $ hg merge default --tool
To always use that tool in a specific clone, edit clone/.hg/hgrc and add
-"merge = l10nmerge" in the ui section.
+"merge = ddmt" in the ui section. It’s also possible to configure this merge
+tool only for certain files; see “hg help merge-tools” for more info.