Permalink
Browse files

Specify custom merge drivers.

  • Loading branch information...
1 parent fde273d commit 74f5b03651166b9fe9d327bdab887bba253941a6 @bhaible bhaible committed Jul 2, 2009
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitattributes
View
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog

0 comments on commit 74f5b03

Please sign in to comment.