Fix bogus error message from merge-recursive error path
authorJunio C Hamano <junkio@cox.net>
Mon, 2 Apr 2007 04:13:27 +0000 (21:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 5 Apr 2007 22:07:16 +0000 (15:07 -0700)
commit0424138...5715dbf8605bacfbd22210aac85a1a8f
treed3e540a...3cad4074ceb50f04e8b5a2b3bb6c5fc8copy hash to clipboard (tree)
parentb188258...6ae60e67e646097945c8365779175ee2copy hash to clipboard (diff)
cache.h
merge-recursive.c
read-cache.c