aboutsummaryrefslogtreecommitdiffstats
path: root/t/null-bytes
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/null-bytes
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 't/null-bytes')
-rwxr-xr-xt/null-bytes15
1 files changed, 15 insertions, 0 deletions
diff --git a/t/null-bytes b/t/null-bytes
new file mode 100755
index 0000000..9a7ee7f
--- /dev/null
+++ b/t/null-bytes
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+. t/common.sh
+
+(
+ printf '%s\n' "${HEAD} ours"
+ printf 'same\000text\n'
+ printf '%s\n' "${TAIL}"
+ printf 'same\000text\n'
+ printf '%s\n' "${END} theirs"
+) > file
+
+printf 'same\000text\n' > file.expected
+
+"$command" --reduce file
+cmp -s -- file file.expected