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-yes-no | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 't/no-option-merge-yes-no') diff --git a/t/no-option-merge-yes-no b/t/no-option-merge-yes-no index f351e7c..af35ed8 100755 --- a/t/no-option-merge-yes-no +++ b/t/no-option-merge-yes-no @@ -3,11 +3,11 @@ printf '%s\n' > file \ "${HEAD} ours" \ - ours \ + old \ "${PARENT} base" \ - base \ + old \ "${TAIL}" \ - theirs \ + new \ "${END} theirs" cp -- file file.expected -- cgit v1.3.1