diff options
Diffstat (limited to 't/combination-remove-base-select-tail-reduce')
| -rwxr-xr-x | t/combination-remove-base-select-tail-reduce | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/combination-remove-base-select-tail-reduce b/t/combination-remove-base-select-tail-reduce new file mode 100755 index 0000000..8e0f465 --- /dev/null +++ b/t/combination-remove-base-select-tail-reduce @@ -0,0 +1,18 @@ +#!/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 \ + theirs + +normal --remove-base --select-tail --reduce file + +also_interactive t |