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