projects
/
platform
/
upstream
/
automake.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f874f9e
)
gitattributes: custom merge driver for ChangeLog not needed anymore
author
Stefano Lattarini
<stefano.lattarini@gmail.com>
Tue, 14 Feb 2012 12:25:35 +0000
(13:25 +0100)
committer
Stefano Lattarini
<stefano.lattarini@gmail.com>
Tue, 14 Feb 2012 12:25:35 +0000
(13:25 +0100)
* .gitattributes: We don't maintain a version-controlled ChangeLog
file anymore, so we have no need to specify a custom merge driver
for it anymore. Update accordingly.
.gitattributes
patch
|
blob
|
history
diff --git
a/.gitattributes
b/.gitattributes
index
6fec56e
..
5126add
100644
(file)
--- a/
.gitattributes
+++ b/
.gitattributes
@@
-1,3
+1,2
@@
-ChangeLog merge=merge-changelog
NEWS merge=union
*.texi* diff=texinfo