From 9b98f1a9222e5e96949bf74538a97900f2d847b1 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
Date: Thu, 24 Sep 2026 23:19:13 +0200
Subject: Add --symmetric
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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 't/common.sh')

diff --git a/t/common.sh b/t/common.sh
index 30e4b6e..38d2845 100644
--- a/t/common.sh
+++ b/t/common.sh
@@ -141,7 +141,7 @@ interactive_filename () {
 
 interactive_prompt () {
 	test $# = 2
-	printf '\e[1;34m(%s/%s) Resolve this conflict [h,t,b,m,r,e,s,d,q,?]? \e[0m\n' "$1" "$2"
+	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_help () {
@@ -155,6 +155,7 @@ interactive_help () {
 	fi
 	printf '%s\n' \
 		'm - merge' \
+		'y - select symmetric branches' \
 		'r - reduce' \
 		'e - manually edit this hunk' \
 		's - skip this hunk' \
-- 
cgit v1.3.1