merge-recursive: improve add_cacheinfo error handling
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:16 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commitfd53b7f...d1bd499d24fa48b43a79703355bde512
tree6e474c8...e779ad0001b75393f2d61d0e586acaf8copy hash to clipboard (tree)
parent6e7e027...e5f4a8d61597a86e7f2b6087e23a759ccopy hash to clipboard (diff)
merge-recursive.c
t/t3501-revert-cherry-pick.sh