merge-tree: fix where two branches share no changes
authorWill Palmer <wmpalmer@gmail.com>
Wed, 14 Jul 2010 17:04:07 +0000 (18:04 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jul 2010 19:56:49 +0000 (12:56 -0700)
commit21baa6e...c56d229866c02c4b42b8b53af648d853
tree0f651d6...beff4fdcdde40754d0deb8ef8caf0714copy hash to clipboard (tree)
parentf32e985...d40e26da0c042ca35bf07fa456c9832bcopy hash to clipboard (diff)
builtin/merge-tree.c
t/t4300-merge-tree.sh