diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-02-11 13:27:09 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2008-02-11 13:30:16 +0100 |
| commit | 63fdbedfb1e058306fbe60053eef0a050ab99016 (patch) | |
| tree | 3a1a004a5424136260bb0fabe94a15014c5bf282 | |
| parent | 0f37e2e6ef48a1b0befb5c952ccb9cb013187053 (diff) | |
| download | gnulib-63fdbedfb1e058306fbe60053eef0a050ab99016.tar.gz | |
Specify custom merge drivers.
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | ChangeLog | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..ca4ea2772a --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog @@ -1,3 +1,7 @@ +2008-02-11 Bruno Haible <bruno@clisp.org> + + * .gitattributes: New file. + 2008-02-11 Jim Meyering <meyering@redhat.com> useless-if-before-free: Fix reversed exit values. |