/* Installation:
- $ gnulib-tool --create-testdir --dir=/tmp/testdir123 git-merge-changelog
- $ cd /tmp/testdir123
- $ ./configure
- $ make
- $ make install
-
- Additionally, for git users:
+ For git users:
- Add to .git/config of the checkout (or to your $HOME/.gitconfig) the
lines
[merge "merge-changelog"]
name = GNU-style ChangeLog merge driver
- driver = /usr/local/bin/git-merge-changelog %O %A %B
+ driver = /usr/bin/git-merge-changelog %O %A %B
- In every directory that contains a ChangeLog file, add a file
'.gitattributes' with this line:
(See "man 5 gitattributes" for more info.)
- Additionally, for bzr users:
+ For bzr users:
- Install the 'extmerge' bzr plug-in listed at
<http://doc.bazaar.canonical.com/plugins/en/index.html>
<http://wiki.bazaar.canonical.com/BzrPlugins>
$ bzr extmerge ChangeLog
- Additionally, for hg users:
+ For hg users:
- 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.executable = /usr/bin/git-merge-changelog
git-merge-changelog.args = $base $local $other
See <http://www.selenic.com/mercurial/hgrc.5.html> section merge-tools