Merge branch 'jc/ll-merge-binary-ours'
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 04:39:56 +0000 (21:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 04:39:56 +0000 (21:39 -0700)
commite6d29a4...47cf476e18658609033bdee4c42db3b8
tree4084972...8b9a9f254cfcc54c7b51480bf58b5356copy hash to clipboard (tree)
parent1b96965...8b9c9110109110d546b5e779095ee1d9copy hash to clipboard (diff)
parente0e2065...74500119d5e12524992273de362acd30copy hash to clipboard (diff)
Documentation/gitattributes.txt
attr.c
ll-merge.c