merge-recursive: handle NULL in add_cacheinfo() correctly
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 26 Nov 2016 12:48:06 +0000 (13:48 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2016 19:00:04 +0000 (11:00 -0800)
commit55e9f0e...c9a918c246b7eae1fe2a2e954f6426af
tree2cf4d7c...f11a4da2089ae41ebab4ff280f81e417copy hash to clipboard (tree)
parent05f2dfb...65476a59050b7c3446b1281bdcac7051copy hash to clipboard (diff)
merge-recursive.c
t/t3501-revert-cherry-pick.sh