diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-06-06 19:46:08 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-08 13:06:09 -0700 |
| commit | 2c970c9ec3af9e162951a1b22d42c1a4dd9a8fed (patch) | |
| tree | 7031a4f7b6c26e3207a5ee2308096f1e55818f86 /notes-merge.h | |
| parent | am --skip: revert changes introduced by failed 3way merge (diff) | |
| download | tgif-2c970c9ec3af9e162951a1b22d42c1a4dd9a8fed.tar.xz | |
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>
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions