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