Re: merging emacs-24

[Andreas Schwab]

Ted Zlatanov <address@hidden> writes:

> TZ> I used the recommended gnulib driver:
>
> TZ> [merge "merge-changelog"]
> TZ>         name = GNU-style ChangeLog merge driver
> TZ>         driver = /usr/local/bin/git-merge-changelog %O %A %B
>
> I'm not sure if this means that `git-merge-changelog' doesn't work the
> way the Emacs maintainers want, or that I used it incorrectly. Hints
> welcome.

You need to add this to .git/info/attributes:

ChangeLog*      merge=merge-changelog

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."