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/combination-interactive-2-no-interactive | |
| parent | fix doc text (diff) | |
| download | git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.gz git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.bz2 git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/combination-interactive-2-no-interactive')
| -rwxr-xr-x | t/combination-interactive-2-no-interactive | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/t/combination-interactive-2-no-interactive b/t/combination-interactive-2-no-interactive new file mode 100755 index 0000000..1126b8c --- /dev/null +++ b/t/combination-interactive-2-no-interactive @@ -0,0 +1,29 @@ +#!/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 \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +printf '%s' q > input +conflict --interactive --no-interactive --no-interactive file 8<input 9>output +test ! -s output |