| commit | b9b3eef76186d423efb684d01b3e99ef010a61de | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Mar 2011 05:22:06 +0000 (17 22:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Mar 2011 05:22:06 +0000 (17 22:22 -0700) | ||
| tree | f839064d11cf5af7b0839ccbabee3bd645747904 | treesnapshot (tar.gz zip) |
| parent | b2c8c0a762745768e8fb249949801c1aed8f7c1d | commitdiff |
merge-recursive: tweak magic band-aid
Running checks against working tree (e.g. lstat()) and causing
changes to working tree (e.g. unlink()) while building a virtual
ancestor merge does not make any sense. Avoid doing so.
This is not a real fix; it is another magic band-aid on top of
another band-aid we placed earlier.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Running checks against working tree (e.g. lstat()) and causing
changes to working tree (e.g. unlink()) while building a virtual
ancestor merge does not make any sense. Avoid doing so.
This is not a real fix; it is another magic band-aid on top of
another band-aid we placed earlier.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |