diff options
| author | Mattias Andrée <m@maandree.se> | 2026-09-24 23:19:13 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-09-24 23:19:13 +0200 |
| commit | 9b98f1a9222e5e96949bf74538a97900f2d847b1 (patch) | |
| tree | 468ab35cb2ac75ef1c48d76189520ee9bad23495 /t/no-option-reduce-no-yes | |
| parent | Add conflcit resultions strategies and interactive mode, and a lot of tests (diff) | |
| download | git-rediff-90d02a391562d751e299b65ad860b29eb0f66654.tar.gz git-rediff-90d02a391562d751e299b65ad860b29eb0f66654.tar.bz2 git-rediff-90d02a391562d751e299b65ad860b29eb0f66654.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/no-option-reduce-no-yes')
| -rwxr-xr-x | t/no-option-reduce-no-yes | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/t/no-option-reduce-no-yes b/t/no-option-reduce-no-yes index e6a7d8c..9078a9b 100755 --- a/t/no-option-reduce-no-yes +++ b/t/no-option-reduce-no-yes @@ -3,14 +3,25 @@ printf '%s\n' > file \ "${HEAD} ours" \ + same \ ours \ "${PARENT} base" \ + same \ base \ "${TAIL}" \ + same \ theirs \ "${END} theirs" -cp -- file file.expected +printf '%s\n' > file.expected \ + same \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" conflict --no-reduce --reduce file |