Merge branch 'kh/replay-invalid-onto-advance' into seen

author Junio C Hamano <gitster@pobox.com>

Tue, 23 Dec 2025 03:19:47 +0000 (12:19 +0900)

committer Junio C Hamano <gitster@pobox.com>

Tue, 23 Dec 2025 03:19:47 +0000 (12:19 +0900)
author Junio C Hamano <gitster@pobox.com>
Tue, 23 Dec 2025 03:19:47 +0000 (12:19 +0900)
committer Junio C Hamano <gitster@pobox.com>
Tue, 23 Dec 2025 03:19:47 +0000 (12:19 +0900)
diff --cc builtin/replay.c
Simple merge
diff --cc t/t3650-replay-basics.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Tue, 23 Dec 2025 03:19:47 +0000 (12:19 +0900)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 23 Dec 2025 03:19:47 +0000 (12:19 +0900)
		1	2
builtin/replay.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t3650-replay-basics.sh	patch \|	diff1 \|	diff2 \|	blob \| history