From 7c19d0103e46c9e59b512095693491a4093a13f3 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 25 Sep 2026 19:19:15 +0200 Subject: Add support for combining --merge and --symmetric MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- t/combination-merge-symmetric | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 t/combination-merge-symmetric (limited to 't/combination-merge-symmetric') diff --git a/t/combination-merge-symmetric b/t/combination-merge-symmetric new file mode 100755 index 0000000..40e2adc --- /dev/null +++ b/t/combination-merge-symmetric @@ -0,0 +1,26 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + old-1 \ + "${PARENT} 1" \ + old-1 \ + "${TAIL} 1" \ + new-1 \ + "${END} 1" \ + "${HEAD} 2" \ + new-2 \ + "${PARENT} 2" \ + old-2 \ + "${TAIL} 2" \ + new-2 \ + "${END} 2" + +printf '%s\n' > file.expected \ + new-1 \ + new-2 + +normal --merge --symmetric --no-reduce file + +also_interactive my -- cgit v1.3.1