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-interactive | |
| parent | fix doc text (diff) | |
| download | git-rediff-6c37173839fc23ca440e78fc1b1be4618faa2ad9.tar.gz git-rediff-6c37173839fc23ca440e78fc1b1be4618faa2ad9.tar.bz2 git-rediff-6c37173839fc23ca440e78fc1b1be4618faa2ad9.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/no-option-interactive')
| -rwxr-xr-x | t/no-option-interactive | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/no-option-interactive b/t/no-option-interactive new file mode 100755 index 0000000..5609f68 --- /dev/null +++ b/t/no-option-interactive @@ -0,0 +1,30 @@ +#!/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 --no-interactive file 8<input 9>output +test ! -s output |