Merge branch 'jk/two-way-merge-corner-case-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2013 20:59:25 +0000 (12:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2013 20:59:25 +0000 (12:59 -0800)
commit3979580...65bac968c30ce203022d7a8294710909
tree46597ff...3917d723a1a285166042da516e5ce861copy hash to clipboard (tree)
parent10167eb...51e177349eebf24650d3c0cc26bd0d75copy hash to clipboard (diff)
parent77b43ca...9feac1079f3643988cfadee63e4365f7copy hash to clipboard (diff)
unpack-trees.c