diff options
| author | Mattias Andrée <m@maandree.se> | 2026-09-22 19:53:29 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-09-22 19:53:29 +0200 |
| commit | d8de1b23e8ec896759424a2f146969783cdd89e3 (patch) | |
| tree | ed1ea3e97add5116230fd2df34e42b829a70ab39 /t/reduce-3-middle | |
| parent | fix doc text (diff) | |
| download | git-rediff-master.tar.gz git-rediff-master.tar.bz2 git-rediff-master.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/reduce-3-middle')
| -rwxr-xr-x | t/reduce-3-middle | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/t/reduce-3-middle b/t/reduce-3-middle new file mode 100755 index 0000000..25caf2f --- /dev/null +++ b/t/reduce-3-middle @@ -0,0 +1,54 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + branch-1-before-first \ + branch-1-before-second \ + middle-common-first \ + middle-common-second \ + branch-1-after-first \ + branch-1-after-second \ + "${PARENT} 2" \ + branch-2-before-first \ + branch-2-before-second \ + middle-common-first \ + middle-common-second \ + branch-2-after-first \ + branch-2-after-second \ + "${TAIL} 3" \ + branch-3-before-first \ + branch-3-before-second \ + middle-common-first \ + middle-common-second \ + branch-3-after-first \ + branch-3-after-second \ + "${END} 3" + +printf '%s\n' > file.expected \ + "${HEAD} 1" \ + branch-1-before-first \ + branch-1-before-second \ + "${PARENT} 2" \ + branch-2-before-first \ + branch-2-before-second \ + "${TAIL} 3" \ + branch-3-before-first \ + branch-3-before-second \ + "${END} 3" \ + middle-common-first \ + middle-common-second \ + "${HEAD} 1" \ + branch-1-after-first \ + branch-1-after-second \ + "${PARENT} 2" \ + branch-2-after-first \ + branch-2-after-second \ + "${TAIL} 3" \ + branch-3-after-first \ + branch-3-after-second \ + "${END} 3" + +conflict --reduce file + +also_interactive rrr |