merge-recursive: do not return NULL only to cause segfault
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Jan 2010 00:38:56 +0000 (16:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jan 2010 01:02:30 +0000 (17:02 -0800)
commit19c6a4f...369f37c0df1fb57008a891eb6a6dc4bb
tree931a497...32219630e51ff1efc333150343333bdecopy hash to clipboard (tree)
parent703e6e7...a14825e5b0c960d525f34e607154b4f7copy hash to clipboard (diff)
merge-recursive.c