diff options
| author | Mattias Andrée <m@maandree.se> | 2026-09-22 19:53:29 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-09-22 19:53:29 +0200 |
| commit | d8de1b23e8ec896759424a2f146969783cdd89e3 (patch) | |
| tree | ed1ea3e97add5116230fd2df34e42b829a70ab39 /t/all-positive-options-select-head | |
| parent | fix doc text (diff) | |
| download | git-rediff-master.tar.gz git-rediff-master.tar.bz2 git-rediff-master.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -rwxr-xr-x | t/all-positive-options-select-head | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/all-positive-options-select-head b/t/all-positive-options-select-head new file mode 100755 index 0000000..999dc31 --- /dev/null +++ b/t/all-positive-options-select-head @@ -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 --select-head --remove-base --reduce --interactive file 8<input 9>output +test -s output |