On Mon, Mar 9, 2009 at 12:42 AM, James Youngman <j...@gnu.org> wrote: > $ git rebase master > First, rewinding head to replay your work on top of it... > Applying Update to version 0.17 of GNU gettext. > error: patch failed: ChangeLog:41 > error: ChangeLog: patch does not apply > Using index info to reconstruct a base tree... > Falling back to patching base and 3-way merge... > /usr/local/bin/git-merge-changelog: expected three arguments
> $ cat .git/config > [merge "cl-merge"] > name = GNU-style ChangeLog merge driver > driver = /usr/local/bin/git-merge-changelog Solved. The driver line needs to be driver = /usr/local/bin/git-merge-changelog %O %A %B I had just missed these out - they're mentioned in the README section of the driver. James.
