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-multiple-partial | |
| 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 '')
| -rwxr-xr-x | t/reduce-3-multiple-partial | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/t/reduce-3-multiple-partial b/t/reduce-3-multiple-partial new file mode 100755 index 0000000..ec8cab7 --- /dev/null +++ b/t/reduce-3-multiple-partial @@ -0,0 +1,70 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + head-common-first \ + head-common-second \ + branch-1-first-a \ + branch-1-first-b \ + middle-common-first \ + middle-common-second \ + branch-1-second-a \ + branch-1-second-b \ + tail-common-first \ + tail-common-second \ + "${PARENT} 2" \ + head-common-first \ + head-common-second \ + branch-2-first-a \ + branch-2-first-b \ + middle-common-first \ + middle-common-second \ + branch-2-second-a \ + branch-2-second-b \ + tail-common-first \ + tail-common-second \ + "${TAIL} 3" \ + head-common-first \ + head-common-second \ + branch-3-first-a \ + branch-3-first-b \ + middle-common-first \ + middle-common-second \ + branch-3-second-a \ + branch-3-second-b \ + tail-common-first \ + tail-common-second \ + "${END} 3" + +printf '%s\n' > file.expected \ + head-common-first \ + head-common-second \ + "${HEAD} 1" \ + branch-1-first-a \ + branch-1-first-b \ + "${PARENT} 2" \ + branch-2-first-a \ + branch-2-first-b \ + "${TAIL} 3" \ + branch-3-first-a \ + branch-3-first-b \ + "${END} 3" \ + middle-common-first \ + middle-common-second \ + "${HEAD} 1" \ + branch-1-second-a \ + branch-1-second-b \ + "${PARENT} 2" \ + branch-2-second-a \ + branch-2-second-b \ + "${TAIL} 3" \ + branch-3-second-a \ + branch-3-second-b \ + "${END} 3" \ + tail-common-first \ + tail-common-second + +conflict --reduce file + +also_interactive rrr |