diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/no-option-merge | 28 | ||||
| -rwxr-xr-x | t/no-option-merge-no-yes | 18 | ||||
| -rwxr-xr-x | t/no-option-merge-yes-no | 17 |
3 files changed, 63 insertions, 0 deletions
diff --git a/t/no-option-merge b/t/no-option-merge new file mode 100755 index 0000000..5f55d74 --- /dev/null +++ b/t/no-option-merge @@ -0,0 +1,28 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + same \ + ours \ + "${PARENT} base" \ + same \ + base \ + "${TAIL}" \ + same \ + theirs \ + "${END} theirs" + +printf '%s\n' > file.expected \ + same \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +conflict --no-merge file + +also_interactive rr diff --git a/t/no-option-merge-no-yes b/t/no-option-merge-no-yes new file mode 100755 index 0000000..8ae2bc4 --- /dev/null +++ b/t/no-option-merge-no-yes @@ -0,0 +1,18 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + old \ + "${PARENT} base" \ + old \ + "${TAIL}" \ + new \ + "${END} theirs" + +printf '%s\n' > file.expected \ + new + +normal --no-merge --merge --no-reduce file + +also_interactive m diff --git a/t/no-option-merge-yes-no b/t/no-option-merge-yes-no new file mode 100755 index 0000000..f351e7c --- /dev/null +++ b/t/no-option-merge-yes-no @@ -0,0 +1,17 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +cp -- file file.expected + +conflict --merge --no-merge file + +also_interactive r |