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