merge-recursive: avoid incorporating uncommitted changes in a merge
authorElijah Newren <newren@gmail.com>
Thu, 21 Dec 2017 19:19:07 +0000 (11:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Dec 2017 20:20:38 +0000 (12:20 -0800)
commit65170c0...d466b18364e0d2b6a360900c073b600f
treea49f75c...833813cf08d9c6b81a3bc4f6c7eafd24copy hash to clipboard (tree)
parentb101793...431b858e49b909bb309a87145fb7348ccopy hash to clipboard (diff)
merge-recursive.c
t/t6044-merge-unrelated-index-changes.sh