merge-recursive: avoid triggering add_cacheinfo error with dirty mod
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:18 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit2f682e2...a6dc3b7403fd0162252183fdef019274
tree7786c76...e8bc53641337149f91818f5b919c5595copy hash to clipboard (tree)
parentbd42380...f1ec773d1557b28ba6924f4020333143copy hash to clipboard (diff)
merge-recursive.c
t/t3501-revert-cherry-pick.sh