On Sun, Mar 8, 2009 at 1:43 PM, James Youngman <[email protected]> wrote: > * import-gnulib.sh (check_merge_driver): New function; verifies > that we have a merge driver installed for the ChangeLog file (if > we're on the master or release branch, the check is skipped). > Also check that the .gitattributes file exists. > * README-hacking: Point out that using a merge driver for ChangeLog is > a good idea. > * .gitattributes: new file >
I just applied and pushed this (on master) since I have quite a few topic branches that I expect to merge soon. James.
