Merge branch 'jk/two-way-merge-corner-case-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:32:04 +0000 (11:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:32:17 +0000 (11:32 -0800)
commit4766036...cdee2d45b5a955409da5e6751c3e2f05
tree7adcc5c...9b32dc7e0cd850bcfad22e0bae7064c6copy hash to clipboard (tree)
parent66c24cd...a4b8db93b5fee81f144d6411ac7e5391copy hash to clipboard (diff)
parent77b43ca...9feac1079f3643988cfadee63e4365f7copy hash to clipboard (diff)
unpack-trees.c