aboutsummaryrefslogtreecommitdiffstats
path: root/t/select-tail-4
diff options
context:
space:
mode:
authorMattias Andrée <m@maandree.se>2026-09-22 19:53:29 +0200
committerMattias Andrée <m@maandree.se>2026-09-22 19:53:29 +0200
commitd8de1b23e8ec896759424a2f146969783cdd89e3 (patch)
treeed1ea3e97add5116230fd2df34e42b829a70ab39 /t/select-tail-4
parentfix doc text (diff)
downloadgit-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.gz
git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.bz2
git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.xz
Add conflcit resultions strategies and interactive mode, and a lot of testsHEAD1.1master
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
-rwxr-xr-xt/select-tail-422
1 files changed, 22 insertions, 0 deletions
diff --git a/t/select-tail-4 b/t/select-tail-4
new file mode 100755
index 0000000..45111db
--- /dev/null
+++ b/t/select-tail-4
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+ "${HEAD} head" \
+ head \
+ "${PARENT} 2" \
+ second \
+ "${PARENT} 3" \
+ third \
+ "${PARENT} 4" \
+ fourth \
+ "${TAIL}" \
+ tail \
+ "${END} tail"
+
+printf '%s\n' > file.expected \
+ tail
+
+normal --select-tail --no-reduce file
+
+also_interactive t