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/merge-lower-middle-4 | |
| parent | fix doc text (diff) | |
| download | git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.gz git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.bz2 git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.xz | |
Add conflcit resultions strategies and interactive mode, and a lot of tests1.1
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -rwxr-xr-x | t/merge-lower-middle-4 | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/t/merge-lower-middle-4 b/t/merge-lower-middle-4 new file mode 100755 index 0000000..a378bcc --- /dev/null +++ b/t/merge-lower-middle-4 @@ -0,0 +1,28 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + same \ + "${PARENT} 2" \ + same \ + "${PARENT} 3" \ + different \ + "${TAIL}" \ + same \ + "${END} 4" + +printf '%s\n' > file.expected \ + "${HEAD} 1" \ + same \ + "${PARENT} 2" \ + same \ + "${PARENT} 3" \ + different \ + "${TAIL}" \ + same \ + "${END} 4" + +conflict --merge --no-reduce file + +also_interactive m |