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