diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/remove-base-4 | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/t/remove-base-4 b/t/remove-base-4 new file mode 100755 index 0000000..4e77685 --- /dev/null +++ b/t/remove-base-4 @@ -0,0 +1,19 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} head" \ + head \ + "${PARENT} 2" \ + second \ + "${PARENT} 3" \ + third \ + "${TAIL}" \ + tail \ + "${END} tail" + +cp -- file file.expected + +conflict --remove-base --no-reduce file + +also_interactive b |