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-multiple-files | |
| parent | fix doc text (diff) | |
| download | git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.gz git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.bz2 git-rediff-d8de1b23e8ec896759424a2f146969783cdd89e3.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/merge-multiple-files')
| -rwxr-xr-x | t/merge-multiple-files | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/merge-multiple-files b/t/merge-multiple-files new file mode 100755 index 0000000..23a8bb5 --- /dev/null +++ b/t/merge-multiple-files @@ -0,0 +1,30 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > first \ + "${HEAD} ours" \ + same \ + "${PARENT} base" \ + same \ + "${TAIL}" \ + first-different \ + "${END} theirs" + +printf '%s\n' > first.expected \ + first-different + +printf '%s\n' > second \ + "${HEAD} ours" \ + second-different \ + "${PARENT} base" \ + same \ + "${TAIL}" \ + same \ + "${END} theirs" + +printf '%s\n' > second.expected \ + second-different + +normal --merge --no-reduce first second + +also_interactive mm |