NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / lib / git-merge-changelog.c

diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 500f55b..60dd972 100644 (file)
--- 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.
  */
@@ -990,7 +998,7 @@ usage (int status)
       printf ("  -h, --help                  display this help and exit\n");
       printf ("  -V, --version               output version information and exit\n");
       printf ("\n");
-      fputs ("Report bugs to <bug-gnu-gettext@gnu.org>.\n",
+      fputs ("Report bugs to <bug-gnulib@gnu.org>.\n",
              stdout);
     }