diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-31 01:49:18 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-16 01:32:40 +0300 |
| commit | 629716d256a792179325c2cc7945bb2d81dda8c2 (patch) | |
| tree | e51404037ad3341abba3d7de34824872dadaf021 /t/t4200-rerere.sh | |
| parent | 82efa6e27e76ecd0f52a93886bcee1b8e517a662 (diff) | |
rerere: do use multiple variants
This enables the multiple-variant support for real. Multiple
conflicts of the same shape can have differences in contexts where
they appear, interfering the replaying of recorded resolution of one
conflict to another, and in such a case, their resolutions are
recorded as different variants under the same conflict ID.
We still need to adjust garbage collection codepaths for this
change, but the basic "replay" functionality is functional with
this change.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 6fcc6d4e75..b1bda20923 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -412,7 +412,7 @@ concat_insert () { cat early && printf "%s\n" "$@" && cat late "$last" } -test_expect_failure 'multiple identical conflicts' ' +test_expect_success 'multiple identical conflicts' ' git reset --hard && test_seq 1 6 >early && |