merge-recursive: make sure when we say we abort that we actually abort
authorElijah Newren <newren@gmail.com>
Sun, 1 Jul 2018 01:24:59 +0000 (18:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 16:38:36 +0000 (09:38 -0700)
commit9270239...cefdbd66ca593fa909540230ef9e005e
tree2903cd8...eb8e7a0287c0f0545eaeef4aa84cc12fcopy hash to clipboard (tree)
parentcf69f2a...08f8dc092d57b987f26719fe0d43a40dcopy hash to clipboard (diff)
merge-recursive.c
t/t6044-merge-unrelated-index-changes.sh