am -3: support 3way merge on unborn branch
authorPaul Tan <pyokagan@gmail.com>
Sat, 6 Jun 2015 11:46:08 +0000 (19:46 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Jun 2015 20:06:09 +0000 (13:06 -0700)
While on an unborn branch, git am -3 will fail to do a threeway merge as
it references HEAD as "our tree", but HEAD does not point to a valid
tree.

Fix this by using an empty tree as "our tree" when we are on an unborn
branch.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found