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-2-no-symmetric | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 t/combination-symmetric-2-no-symmetric (limited to 't/combination-symmetric-2-no-symmetric') diff --git a/t/combination-symmetric-2-no-symmetric b/t/combination-symmetric-2-no-symmetric new file mode 100755 index 0000000..6aaf0e0 --- /dev/null +++ b/t/combination-symmetric-2-no-symmetric @@ -0,0 +1,28 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + same \ + new \ + "${PARENT} base" \ + same \ + old \ + "${TAIL}" \ + same \ + new \ + "${END} theirs" + +printf '%s\n' > file.expected \ + same \ + "${HEAD} ours" \ + new \ + "${PARENT} base" \ + old \ + "${TAIL}" \ + new \ + "${END} theirs" + +conflict --symmetric --no-symmetric --no-symmetric file + +also_interactive r -- cgit v1.3.1