diff options
| author | Mattias Andrée <m@maandree.se> | 2026-09-25 19:19:15 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-09-25 19:19:15 +0200 |
| commit | 7c19d0103e46c9e59b512095693491a4093a13f3 (patch) | |
| tree | 85a9cd750a1fa317b6d3866add9d546c7df44b56 /t/all-positive-options-merge-symmetric | |
| parent | Add --symmetric (diff) | |
| download | git-rediff-7c19d0103e46c9e59b512095693491a4093a13f3.tar.gz git-rediff-7c19d0103e46c9e59b512095693491a4093a13f3.tar.bz2 git-rediff-7c19d0103e46c9e59b512095693491a4093a13f3.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/all-positive-options-merge-symmetric')
| -rwxr-xr-x | t/all-positive-options-merge-symmetric | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/all-positive-options-merge-symmetric b/t/all-positive-options-merge-symmetric new file mode 100755 index 0000000..03d3879 --- /dev/null +++ b/t/all-positive-options-merge-symmetric @@ -0,0 +1,23 @@ +#!/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 --merge --symmetric --remove-base --reduce --interactive file 8<input 9>output +test -s output |