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/no-option-merge-no-yes | |
| parent | fix doc text (diff) | |
| download | git-rediff-1.1.tar.gz git-rediff-1.1.tar.bz2 git-rediff-1.1.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -rwxr-xr-x | t/no-option-merge-no-yes | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/no-option-merge-no-yes b/t/no-option-merge-no-yes new file mode 100755 index 0000000..8ae2bc4 --- /dev/null +++ b/t/no-option-merge-no-yes @@ -0,0 +1,18 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + old \ + "${PARENT} base" \ + old \ + "${TAIL}" \ + new \ + "${END} theirs" + +printf '%s\n' > file.expected \ + new + +normal --no-merge --merge --no-reduce file + +also_interactive m |