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-merge | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 't/no-option-merge') diff --git a/t/no-option-merge b/t/no-option-merge index 5f55d74..8f9a63e 100755 --- a/t/no-option-merge +++ b/t/no-option-merge @@ -4,23 +4,23 @@ printf '%s\n' > file \ "${HEAD} ours" \ same \ - ours \ + new \ "${PARENT} base" \ same \ - base \ + old \ "${TAIL}" \ same \ - theirs \ + old \ "${END} theirs" printf '%s\n' > file.expected \ same \ "${HEAD} ours" \ - ours \ + new \ "${PARENT} base" \ - base \ + old \ "${TAIL}" \ - theirs \ + old \ "${END} theirs" conflict --no-merge file -- cgit v1.3.1