On Mon, Mar 9, 2009 at 12:42 AM, James Youngman <j...@gnu.org> wrote: > $ git checkout jy/auto-gettext > Switched to branch "jy/auto-gettext" > $ 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
... it looks like no arguments are being passed at all. James.
