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/symmetric-multiple-files | |
| parent | Add conflcit resultions strategies and interactive mode, and a lot of tests (diff) | |
| download | git-rediff-9b98f1a9222e5e96949bf74538a97900f2d847b1.tar.gz git-rediff-9b98f1a9222e5e96949bf74538a97900f2d847b1.tar.bz2 git-rediff-9b98f1a9222e5e96949bf74538a97900f2d847b1.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/symmetric-multiple-files')
| -rwxr-xr-x | t/symmetric-multiple-files | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/t/symmetric-multiple-files b/t/symmetric-multiple-files new file mode 100755 index 0000000..86d2235 --- /dev/null +++ b/t/symmetric-multiple-files @@ -0,0 +1,29 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > first \ + "${HEAD} ours" \ + same \ + "${PARENT} base" \ + different \ + "${TAIL}" \ + same \ + "${END} theirs" + +printf '%s\n' > first.expected \ + same + +printf '%s\n' > second \ + "${HEAD} ours" \ + different \ + "${PARENT} base" \ + interior \ + "${TAIL}" \ + same \ + "${END} theirs" + +cp -- second second.expected + +conflict --symmetric --no-reduce first second + +also_interactive yy |