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