diff options
| author | Mattias Andrée <m@maandree.se> | 2026-09-25 19:19:15 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-09-25 19:19:15 +0200 |
| commit | 7c19d0103e46c9e59b512095693491a4093a13f3 (patch) | |
| tree | 85a9cd750a1fa317b6d3866add9d546c7df44b56 /t/combination-symmetric-merge | |
| parent | Add --symmetric (diff) | |
| download | git-rediff-7c19d0103e46c9e59b512095693491a4093a13f3.tar.gz git-rediff-7c19d0103e46c9e59b512095693491a4093a13f3.tar.bz2 git-rediff-7c19d0103e46c9e59b512095693491a4093a13f3.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/combination-symmetric-merge')
| -rwxr-xr-x | t/combination-symmetric-merge | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/combination-symmetric-merge b/t/combination-symmetric-merge new file mode 100755 index 0000000..4d2c1a2 --- /dev/null +++ b/t/combination-symmetric-merge @@ -0,0 +1,26 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + old-1 \ + "${PARENT} 1" \ + old-1 \ + "${TAIL} 1" \ + new-1 \ + "${END} 1" \ + "${HEAD} 2" \ + new-2 \ + "${PARENT} 2" \ + old-2 \ + "${TAIL} 2" \ + new-2 \ + "${END} 2" + +printf '%s\n' > file.expected \ + new-1 \ + new-2 + +normal --symmetric --merge --no-reduce file + +also_interactive my |