Mercurial > hg > octave-nkf > gnulib-hg
changeset 16708:1699b04c1c45
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.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Fri, 16 Mar 2012 19:08:17 +0100 |
| parents | 47613935f655 |
| children | 2b67797f59e7 |
| files | ChangeLog lib/git-merge-changelog.c |
| diffstat | 2 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +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.
--- 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. */