* lib/git-merge-changelog.c: Add example on how to use in .hgrc.
+2012-03-15 Mark Wielaard <mark@klomp.org>
+
+ git-merge-changelog: add specific example on how to use with hg.
+ * lib/git-merge-changelog.c: Add example on how to use in .hgrc.
+
2012-03-18 Mark Wielaard <mark@klomp.org>
lib/git-merge-changelog.c (status): Report bugs to bug-gnulib@gnu.org.
$ 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.
*/