diff options
| author | James Youngman <jay@gnu.org> | 2009-03-08 13:20:37 +0000 |
|---|---|---|
| committer | James Youngman <jay@gnu.org> | 2009-03-08 13:42:05 +0000 |
| commit | 06b02626aeabbe89bcd99d8fcc3e4bbf37fa54b5 (patch) | |
| tree | 7a7cd9fdc924d6598e59914b7d23a6afc2f052a8 /.gitattributes | |
| parent | 8eac70595fa9756b128a79cdfe144b06317cf54c (diff) | |
| download | findutils-06b02626aeabbe89bcd99d8fcc3e4bbf37fa54b5.tar.gz | |
Switch to using a merge driver for the ChangeLog file.
* 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
Signed-off-by: James Youngman <jay@gnu.org>
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..384e031d --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=cl-merge |