diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/symmetric-multiple-conflicts | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/t/symmetric-multiple-conflicts b/t/symmetric-multiple-conflicts new file mode 100755 index 0000000..713a96c --- /dev/null +++ b/t/symmetric-multiple-conflicts @@ -0,0 +1,42 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + before \ + "${HEAD} ours" \ + same \ + "${PARENT} base" \ + different-interior \ + "${TAIL}" \ + same \ + "${END} theirs" \ + between \ + "${HEAD} ours" \ + different-head \ + "${PARENT} base" \ + interior \ + "${PARENT} other" \ + interior \ + "${TAIL}" \ + same \ + "${END} theirs" \ + after + +printf '%s\n' > file.expected \ + before \ + same \ + between \ + "${HEAD} ours" \ + different-head \ + "${PARENT} base" \ + interior \ + "${PARENT} other" \ + interior \ + "${TAIL}" \ + same \ + "${END} theirs" \ + after + +conflict --symmetric --no-reduce file + +also_interactive yy |