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