diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-23 15:21:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-23 15:21:01 -0700 |
| commit | d45b7f40b30833b0fff87a734044f465a26f40c9 (patch) | |
| tree | 30cfade4f6ec2d4f173bc7480aecdaec9a945103 /unpack-trees.h | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-d45b7f40b30833b0fff87a734044f465a26f40c9.tar.xz | |
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>
Diffstat (limited to 'unpack-trees.h')
0 files changed, 0 insertions, 0 deletions