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)
commitd45b7f4...b30833b0fff87a734044f465a26f40c9
tree30cfade...f6ec2d4f173bc7480aecdaec9a945103copy hash to clipboard (tree)
parent5ec8217...b6c89974fda94808a310aa651577b25dcopy hash to clipboard (diff)
merge-recursive.c