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