| commit | 74f5b03651166b9fe9d327bdab887bba253941a6 | [log] [tgz] |
|---|---|---|
| author | Bruno Haible <bruno@clisp.org> | Thu Jul 02 10:32:50 2009 +0200 |
| committer | Bruno Haible <bruno@clisp.org> | Thu Jul 02 10:32:50 2009 +0200 |
| tree | a5ca8861407caf017fa94167906953573ba62a94 | |
| parent | fde273d1c27bbfe944e620501ba7166c23997326 [diff] |
Specify custom merge drivers.
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..ca4ea27 --- /dev/null +++ b/.gitattributes
@@ -0,0 +1 @@ +ChangeLog merge=merge-changelog