From 9b98f1a9222e5e96949bf74538a97900f2d847b1 Mon Sep 17 00:00:00 2001 From: Mattias Andrée 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 --- t/combination-symmetric-reduce | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 t/combination-symmetric-reduce (limited to 't/combination-symmetric-reduce') diff --git a/t/combination-symmetric-reduce b/t/combination-symmetric-reduce new file mode 100755 index 0000000..e5e370a --- /dev/null +++ b/t/combination-symmetric-reduce @@ -0,0 +1,36 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + first \ + "${PARENT} base" \ + not-first \ + "${TAIL}" \ + first \ + "${END} theirs" \ + "${HEAD} ours" \ + ours \ + common \ + "${PARENT} base" \ + base \ + common \ + "${TAIL}" \ + theirs \ + common \ + "${END} theirs" + +printf '%s\n' > file.expected \ + first \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" \ + common + +conflict --symmetric --reduce file + +also_interactive yr -- cgit v1.3.1