aboutsummaryrefslogtreecommitdiffstats
path: root/t/all-positive-options-symmetric
diff options
context:
space:
mode:
authorMattias Andrée <m@maandree.se>2026-09-25 19:19:15 +0200
committerMattias Andrée <m@maandree.se>2026-09-25 19:19:15 +0200
commit7c19d0103e46c9e59b512095693491a4093a13f3 (patch)
tree85a9cd750a1fa317b6d3866add9d546c7df44b56 /t/all-positive-options-symmetric
parentAdd --symmetric (diff)
downloadgit-rediff-1.3.tar.gz
git-rediff-1.3.tar.bz2
git-rediff-1.3.tar.xz
Add support for combining --merge and --symmetricHEAD1.3master
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/all-positive-options-symmetric')
-rwxr-xr-xt/all-positive-options-symmetric23
1 files changed, 0 insertions, 23 deletions
diff --git a/t/all-positive-options-symmetric b/t/all-positive-options-symmetric
deleted file mode 100755
index eb53cb9..0000000
--- a/t/all-positive-options-symmetric
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-. t/common.sh
-interactive
-
-printf '%s\n' > file \
- "${HEAD} ours" \
- same \
- ours \
- "${PARENT} base" \
- same \
- base \
- "${TAIL}" \
- same \
- theirs \
- "${END} theirs"
-
-printf '%s\n' > file.expected \
- same \
- ours
-
-printf '%s' h > input
-normal --symmetric --remove-base --reduce --interactive file 8<input 9>output
-test -s output