Mercurial > hg > octave-lojdl > gnulib-hg

changeset 9694:6a8d9b9a5d7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,1 @@
+ChangeLog	merge=merge-changelog
--- a/ChangeLog
+++ b/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.