merge-recursive: Do not look at working tree during a virtual ancestor merge
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 22:21:01 +0000 (15:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 22:21:01 +0000 (15:21 -0700)
Fix another instance of a recursive merge incorrectly paying attention to
the working tree file during a virtual ancestor merge, that resulted in
spurious and useless "addinfo_cache failed" error message.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found