]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5ec8217) | patch
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)
commitd45b7f40b30833b0fff87a734044f465a26f40c9
tree30cfade4f6ec2d4f173bc7480aecdaec9a945103tree | snapshot
parent5ec8217eb6c89974fda94808a310aa651577b25dcommit | 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>
merge-recursive.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.