merge-octopus: abort if index does not match HEAD
authorElijah Newren <newren@gmail.com>
Sun, 10 Apr 2016 06:13:38 +0000 (23:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2016 01:39:43 +0000 (18:39 -0700)
commit3ec62ad...ffba2476e30fdf8e8717756fe62119f9
tree8485a8c...72cb56a6b4b90ddb41e3305864323ae4copy hash to clipboard (tree)
parenta6ee883...8eb56d200c3297184d29ea488a34cf43copy hash to clipboard (diff)
git-merge-octopus.sh
t/t6044-merge-unrelated-index-changes.sh