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