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-4-different-tail | |
| 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 | |
Add --symmetric1.2
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -rwxr-xr-x | t/symmetric-4-different-tail | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/symmetric-4-different-tail b/t/symmetric-4-different-tail new file mode 100755 index 0000000..1bf80ff --- /dev/null +++ b/t/symmetric-4-different-tail @@ -0,0 +1,19 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + same \ + "${PARENT} 2" \ + same \ + "${PARENT} 3" \ + same \ + "${TAIL}" \ + different \ + "${END} theirs" + +cp -- file file.expected + +conflict --symmetric --no-reduce file + +also_interactive y |