merge-recursive: enforce rule that index matches head before merging
authorElijah Newren <newren@gmail.com>
Sun, 1 Jul 2018 01:25:02 +0000 (18:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 16:38:36 +0000 (09:38 -0700)
commiteddd1a4...1d935420e1746108ecfee564114a129f
treece9fafa...4b82ca320feb1df4bc06289d9b17550ecopy hash to clipboard (tree)
parent7f5271f...1584d99fb3c83f308f35295ed78c8b8bcopy hash to clipboard (diff)
merge-recursive.c
t/t6044-merge-unrelated-index-changes.sh
t/t7504-commit-msg-hook.sh
t/t7611-merge-abort.sh