use .git/info/attributes

This commit is contained in:
seanpringle
2012-10-29 07:06:35 +10:00
parent 7c4e831b96
commit cf3a957881

1
.gitattributes vendored
View File

@@ -1 +0,0 @@
config.h merge=ours