| commit | d45b7f40b30833b0fff87a734044f465a26f40c9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 Sep 2011 22:21:01 +0000 (23 15:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 Sep 2011 22:21:01 +0000 (23 15:21 -0700) | ||
| tree | 30cfade4f6ec2d4f173bc7480aecdaec9a945103 | treesnapshot (tar.gz zip) |
| parent | 5ec8217eb6c89974fda94808a310aa651577b25d | commitdiff |
merge-recursive: Do not look at working tree during a virtual ancestor merge
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>
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>
| merge-recursive.c | diffblobblamehistory |