commit | d45b7f40b30833b0fff87a734044f465a26f40c9 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Fri Sep 23 15:21:01 2011 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Fri Sep 23 15:21:01 2011 -0700 |
tree | 30cfade4f6ec2d4f173bc7480aecdaec9a945103 | |
parent | 5ec8217eb6c89974fda94808a310aa651577b25d [diff] |
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>