Specify custom merge drivers.
author |
Bruno Haible <bruno@clisp.org> |
date |
Mon, 11 Feb 2008 13:27:09 +0100 |
parents |
2e591b4ebd0d |
children |
abc803d0356b |
files |
.gitattributes ChangeLog |
diffstat |
2 files changed, 5 insertions(+), 0 deletions(-)
[+]
|
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitattributes Mon Feb 11 13:27:09 2008 +0100
@@ -0,0 +1,1 @@
+ChangeLog merge=merge-changelog
--- a/ChangeLog Mon Feb 11 13:24:11 2008 +0100
+++ b/ChangeLog Mon Feb 11 13:27:09 2008 +0100
@@ -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.