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/combination-select-tail-reduce | |
| 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 '')
| -rwxr-xr-x | t/combination-select-tail-reduce | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/combination-select-tail-reduce b/t/combination-select-tail-reduce new file mode 100755 index 0000000..c1504ac --- /dev/null +++ b/t/combination-select-tail-reduce @@ -0,0 +1,30 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + not first \ + "${PARENT} base" \ + not first \ + "${TAIL}" \ + first \ + "${END} theirs" \ + "${HEAD} ours" \ + ours \ + common \ + "${PARENT} base" \ + base \ + common \ + "${TAIL}" \ + theirs \ + common \ + "${END} theirs" + +printf '%s\n' > file.expected \ + first \ + theirs \ + common + +normal --select-tail --reduce file + +also_interactive tt |