diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/no-option-reduce-no-yes | 13 | ||||
| -rwxr-xr-x | t/no-option-reduce-yes-no | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/t/no-option-reduce-no-yes b/t/no-option-reduce-no-yes index e6a7d8c..9078a9b 100755 --- a/t/no-option-reduce-no-yes +++ b/t/no-option-reduce-no-yes @@ -3,14 +3,25 @@ printf '%s\n' > file \ "${HEAD} ours" \ + same \ ours \ "${PARENT} base" \ + same \ base \ "${TAIL}" \ + same \ theirs \ "${END} theirs" -cp -- file file.expected +printf '%s\n' > file.expected \ + same \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" conflict --no-reduce --reduce file diff --git a/t/no-option-reduce-yes-no b/t/no-option-reduce-yes-no index 82fa7bd..8a55b15 100755 --- a/t/no-option-reduce-yes-no +++ b/t/no-option-reduce-yes-no @@ -3,10 +3,13 @@ printf '%s\n' > file \ "${HEAD} ours" \ + same \ ours \ "${PARENT} base" \ + same \ base \ "${TAIL}" \ + same \ theirs \ "${END} theirs" |