From 629716d256a792179325c2cc7945bb2d81dda8c2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 30 Jul 2015 15:49:18 -0700 Subject: 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 --- t/t4200-rerere.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') 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 && -- cgit v1.2.1