diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/no-option-symmetric | 28 | ||||
| -rwxr-xr-x | t/no-option-symmetric-no-yes | 18 | ||||
| -rwxr-xr-x | t/no-option-symmetric-yes-no | 17 |
3 files changed, 63 insertions, 0 deletions
diff --git a/t/no-option-symmetric b/t/no-option-symmetric new file mode 100755 index 0000000..82d6b73 --- /dev/null +++ b/t/no-option-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 --no-symmetric file + +also_interactive r diff --git a/t/no-option-symmetric-no-yes b/t/no-option-symmetric-no-yes new file mode 100755 index 0000000..45954cb --- /dev/null +++ b/t/no-option-symmetric-no-yes @@ -0,0 +1,18 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + new \ + "${PARENT} base" \ + old \ + "${TAIL}" \ + new \ + "${END} theirs" + +printf '%s\n' > file.expected \ + new + +normal --no-symmetric --symmetric --no-reduce file + +also_interactive y diff --git a/t/no-option-symmetric-yes-no b/t/no-option-symmetric-yes-no new file mode 100755 index 0000000..415467c --- /dev/null +++ b/t/no-option-symmetric-yes-no @@ -0,0 +1,17 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + same \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + same \ + "${END} theirs" + +cp -- file file.expected + +conflict --symmetric --no-symmetric --no-reduce file + +also_interactive r |