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