From 6cfb7e03622dcdb23c1a0edce72b771cfa4aa1df Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 16 Mar 2012 19:08:17 +0100 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ lib/git-merge-changelog.c | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0e60262c2..03e424f1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-03-15 Mark Wielaard + + 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 lib/git-merge-changelog.c (status): Report bugs to bug-gnulib@gnu.org. 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 section merge-tools for reference. */ -- 2.11.0