Merge branch 'jc/ll-merge-binary-ours' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:26:51 +0000 (10:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:26:51 +0000 (10:26 -0700)
commit8c4bcd3...bd194d7932a153f464cbc6ada7b27b46
tree17331f7...07c0353a5adac2451fc6e817ce16e902copy hash to clipboard (tree)
parent19100d3...7db17a85dc58265ae5388b1bf483f44fcopy hash to clipboard (diff)
parente0e2065...74500119d5e12524992273de362acd30copy hash to clipboard (diff)
Documentation/gitattributes.txt
attr.c
ll-merge.c