projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unicodeio: depend on stdio, not ignore-value
[gnulib.git]
/
lib
/
git-merge-changelog.c
diff --git
a/lib/git-merge-changelog.c
b/lib/git-merge-changelog.c
index
e2ad303
..
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:
$ 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.
*/
See <http://www.selenic.com/mercurial/hgrc.5.html> section merge-tools
for reference.
*/