diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/combination-symmetric-2-no-symmetric | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/t/combination-symmetric-2-no-symmetric b/t/combination-symmetric-2-no-symmetric new file mode 100755 index 0000000..6aaf0e0 --- /dev/null +++ b/t/combination-symmetric-2-no-symmetric @@ -0,0 +1,28 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + same \ + new \ + "${PARENT} base" \ + same \ + old \ + "${TAIL}" \ + same \ + new \ + "${END} theirs" + +printf '%s\n' > file.expected \ + same \ + "${HEAD} ours" \ + new \ + "${PARENT} base" \ + old \ + "${TAIL}" \ + new \ + "${END} theirs" + +conflict --symmetric --no-symmetric --no-symmetric file + +also_interactive r |