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-2-non-aligned | |
| parent | fix doc text (diff) | |
| download | git-rediff-1.1.tar.gz git-rediff-1.1.tar.bz2 git-rediff-1.1.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/reduce-2-non-aligned')
| -rwxr-xr-x | t/reduce-2-non-aligned | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/t/reduce-2-non-aligned b/t/reduce-2-non-aligned new file mode 100755 index 0000000..58202d1 --- /dev/null +++ b/t/reduce-2-non-aligned @@ -0,0 +1,43 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + before-common-first \ + before-common-second \ + head-only-first \ + head-only-second \ + middle-common-first \ + middle-common-second \ + head-last \ + "${TAIL} 2" \ + before-common-first \ + before-common-second \ + tail-only \ + middle-common-first \ + middle-common-second \ + tail-last-first \ + tail-last-second \ + "${END} 2" + +printf '%s\n' > file.expected \ + before-common-first \ + before-common-second \ + "${HEAD} 1" \ + head-only-first \ + head-only-second \ + "${TAIL} 2" \ + tail-only \ + "${END} 2" \ + middle-common-first \ + middle-common-second \ + "${HEAD} 1" \ + head-last \ + "${TAIL} 2" \ + tail-last-first \ + tail-last-second \ + "${END} 2" + +conflict --reduce file + +also_interactive rrr |