merge-recursive: fix assumption that head tree being merged is HEAD
authorElijah Newren <newren@gmail.com>
Sun, 1 Jul 2018 01:25:00 +0000 (18:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 16:38:36 +0000 (09:38 -0700)
commite1f8694...3394caf3d3cd57c6c7593f0b0cdb1f9e
treedd07179...9af2ebd29a518d3553ea061ceb099b77copy hash to clipboard (tree)
parent9270239...cefdbd66ca593fa909540230ef9e005ecopy hash to clipboard (diff)
builtin/am.c
cache.h
merge-recursive.c
read-cache.c
t/t6044-merge-unrelated-index-changes.sh