X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgit-merge-changelog.c;h=60dd97245a9f42fc61d8c322d077b101e9a89c29;hb=05c9fb114d40810816df58c1e948ba3c93a4a147;hp=e2ad3039acb9dab958a764c01ed00340576e165d;hpb=bed5facc8ba8813aec741ae883a5021f4bc6339e;p=gnulib.git

diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index e2ad3039a..60dd97245 100644
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -75,7 +75,15 @@
           $ bzr extmerge ChangeLog
 
    Additionally, for hg users:
-     - Add to your $HOME/.hgrc a couple of lines in a section [merge-tools].
+     - Add to your $HOME/.hgrc the lines
+
+        [merge-patterns]
+        ChangeLog = git-merge-changelog
+
+        [merge-tools]
+        git-merge-changelog.executable = /usr/local/bin/git-merge-changelog
+        git-merge-changelog.args = $base $local $other
+
        See <http://www.selenic.com/mercurial/hgrc.5.html> section merge-tools
        for reference.
  */