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/combination-symmetric-reduce | |
| 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 '')
| -rwxr-xr-x | t/combination-symmetric-reduce | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/t/combination-symmetric-reduce b/t/combination-symmetric-reduce new file mode 100755 index 0000000..e5e370a --- /dev/null +++ b/t/combination-symmetric-reduce @@ -0,0 +1,36 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + first \ + "${PARENT} base" \ + not-first \ + "${TAIL}" \ + first \ + "${END} theirs" \ + "${HEAD} ours" \ + ours \ + common \ + "${PARENT} base" \ + base \ + common \ + "${TAIL}" \ + theirs \ + common \ + "${END} theirs" + +printf '%s\n' > file.expected \ + first \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" \ + common + +conflict --symmetric --reduce file + +also_interactive yr |