From b2cb62247abe54ff6063b92d2d74eb4ee76c197d Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
Date: Sat, 10 Oct 2026 14:20:03 +0200
Subject: Make ^L redraw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <m@maandree.se>
---
 t/common.sh          |  4 ++++
 t/interactive-redraw | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100755 t/interactive-redraw

(limited to 't')

diff --git a/t/common.sh b/t/common.sh
index 38d2845..bb1bd83 100644
--- a/t/common.sh
+++ b/t/common.sh
@@ -144,6 +144,10 @@ interactive_prompt () {
 	printf '\e[1;34m(%s/%s) Resolve this conflict [h,t,b,m,y,r,e,s,d,q,?]? \e[0m\n' "$1" "$2"
 }
 
+interactive_clear_screen () {
+	printf '\e[H\e[2J'
+}
+
 interactive_help () {
 	test $# = 1
 	printf '\e[1;31m'
diff --git a/t/interactive-redraw b/t/interactive-redraw
new file mode 100755
index 0000000..71fdca6
--- /dev/null
+++ b/t/interactive-redraw
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+. t/common.sh
+interactive
+
+printf '%s\n' > file \
+	"${HEAD} ours" \
+	head \
+	"${TAIL}" \
+	tail \
+	"${END} theirs"
+
+printf '%s\n' > file.expected \
+	head
+
+(
+	interactive_marker "${HEAD} ours"
+	interactive_side head
+	interactive_marker "${TAIL}"
+	interactive_side tail
+	interactive_marker "${END} theirs"
+	interactive_prompt 1 1
+	interactive_clear_screen
+	interactive_marker "${HEAD} ours"
+	interactive_side head
+	interactive_marker "${TAIL}"
+	interactive_side tail
+	interactive_marker "${END} theirs"
+	interactive_prompt 1 1
+) > output.expected
+
+printf '\fh' > input
+normal --interactive file 8<input 9>output
+diff -u -- output.expected output >&2
-- 
cgit v1.3.1