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