| commit | 52aaf649cb70134090c3e3a762bed730d5451c17 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Mon, 9 Jul 2007 13:47:24 +0000 (9 14:47 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 10 Jul 2007 06:39:59 +0000 (9 23:39 -0700) | ||
| tree | 78ce43c2dcba2ec9790fcb968d697eb533e97840 | treesnapshot (tar.gz zip) |
| parent | f39a946a1fb0fa4856cd0027b9da3603a1b06fdc | commitdiff |
rerere: record resolution even if file is not in merge base
Two-file merges were rare enough that they were dropped outside of the
radar. This fix is a trivial change to builtin-rerere.c::find_conflict().
It is still sane to insist that we do not do rerere for symlinks, and
require to have stages #2 and #3, but we can drop the requirement to have
stage #1. rerere does not use information from there anyway.
This fix is from Junio, together with two tests to verify that it works
as expected.
Acked-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Two-file merges were rare enough that they were dropped outside of the
radar. This fix is a trivial change to builtin-rerere.c::find_conflict().
It is still sane to insist that we do not do rerere for symlinks, and
require to have stages #2 and #3, but we can drop the requirement to have
stage #1. rerere does not use information from there anyway.
This fix is from Junio, together with two tests to verify that it works
as expected.
Acked-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-rerere.c | diffblobblamehistory | |
| t/t4200-rerere.sh | diffblobblamehistory |