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