From: Paul Tan <pyokagan@gmail.com>
Date: Sat, 6 Jun 2015 11:46:08 +0000 (+0800)
Subject: am -3: support 3way merge on unborn branch
X-Git-Tag: v2.4.8~4^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2c970c9ec3af9e162951a1b22d42c1a4dd9a8fed?hp=2c970c9ec3af9e162951a1b22d42c1a4dd9a8fed

am -3: support 3way merge on unborn branch

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>
---