| commit | 3ec62ad9ffba2476e30fdf8e8717756fe62119f9 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 10 Apr 2016 06:13:38 +0000 (9 23:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Apr 2016 01:39:43 +0000 (12 18:39 -0700) | ||
| tree | 8485a8c272cb56a6b4b90ddb41e3305864323ae4 | treesnapshot (tar.gz zip) |
| parent | a6ee883b8eb56d200c3297184d29ea488a34cf43 | commitdiff |
merge-octopus: abort if index does not match HEAD
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-merge-octopus.sh | diffblobblamehistory | |
| t/t6044-merge-unrelated-index-changes.sh | diffblobblamehistory |