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/remove-base-3 | |
| 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/remove-base-3 | 22 | ||||
| -rwxr-xr-x | t/remove-base-3-empty-base | 21 | ||||
| -rwxr-xr-x | t/remove-base-3-empty-head | 20 | ||||
| -rwxr-xr-x | t/remove-base-3-empty-tail | 20 |
4 files changed, 83 insertions, 0 deletions
diff --git a/t/remove-base-3 b/t/remove-base-3 new file mode 100755 index 0000000..b0be37f --- /dev/null +++ b/t/remove-base-3 @@ -0,0 +1,22 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +printf '%s\n' > file.expected \ + "${HEAD} ours" \ + ours \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +conflict --remove-base --no-reduce file + +also_interactive bb diff --git a/t/remove-base-3-empty-base b/t/remove-base-3-empty-base new file mode 100755 index 0000000..b3e009d --- /dev/null +++ b/t/remove-base-3-empty-base @@ -0,0 +1,21 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +printf '%s\n' > file.expected \ + "${HEAD} ours" \ + ours \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +conflict --remove-base --no-reduce file + +also_interactive bb diff --git a/t/remove-base-3-empty-head b/t/remove-base-3-empty-head new file mode 100755 index 0000000..af4f9e9 --- /dev/null +++ b/t/remove-base-3-empty-head @@ -0,0 +1,20 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +printf '%s\n' > file.expected \ + "${HEAD} ours" \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +conflict --remove-base --no-reduce file + +also_interactive bb diff --git a/t/remove-base-3-empty-tail b/t/remove-base-3-empty-tail new file mode 100755 index 0000000..bf0302b --- /dev/null +++ b/t/remove-base-3-empty-tail @@ -0,0 +1,20 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + "${END} theirs" + +printf '%s\n' > file.expected \ + "${HEAD} ours" \ + ours \ + "${TAIL}" \ + "${END} theirs" + +conflict --remove-base --no-reduce file + +also_interactive bb |