merge-recursive: fix check for skipability of working tree updates
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:23 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit1de70db...1ada0069d1b6cd6345323906cc9a9ed3
tree1e1fe72...4585bd1aea71f855d2fe2dbade70fd21copy hash to clipboard (tree)
parent05cf21e...a29d18eb6cdece25613c6b1b036872d0copy hash to clipboard (diff)
merge-recursive.c
t/t6022-merge-rename.sh
t/t6043-merge-rename-directories.sh
t/t6046-merge-skip-unneeded-updates.sh