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/no-option-reduce-no-yes | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 't/no-option-reduce-no-yes') diff --git a/t/no-option-reduce-no-yes b/t/no-option-reduce-no-yes index e6a7d8c..9078a9b 100755 --- a/t/no-option-reduce-no-yes +++ b/t/no-option-reduce-no-yes @@ -3,14 +3,25 @@ printf '%s\n' > file \ "${HEAD} ours" \ + same \ ours \ "${PARENT} base" \ + same \ base \ "${TAIL}" \ + same \ theirs \ "${END} theirs" -cp -- file file.expected +printf '%s\n' > file.expected \ + same \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" conflict --no-reduce --reduce file -- cgit v1.3.1