aboutsummaryrefslogtreecommitdiffstats
path: root/t/reduce-is-default
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/reduce-is-default
parentfix doc text (diff)
downloadgit-rediff-1.1.tar.gz
git-rediff-1.1.tar.bz2
git-rediff-1.1.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 't/reduce-is-default')
-rwxr-xr-xt/reduce-is-default23
1 files changed, 23 insertions, 0 deletions
diff --git a/t/reduce-is-default b/t/reduce-is-default
new file mode 100755
index 0000000..c5f7dd8
--- /dev/null
+++ b/t/reduce-is-default
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+ "${HEAD} HEAD" \
+ same \
+ head \
+ "${TAIL}" \
+ same \
+ tail \
+ "${END} branch"
+
+printf '%s\n' > file.expected \
+ same \
+ "${HEAD} HEAD" \
+ head \
+ "${TAIL}" \
+ tail \
+ "${END} branch"
+
+conflict file
+
+also_interactive rr