diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/no-option-merge | 12 | ||||
| -rwxr-xr-x | t/no-option-merge-yes-no | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/t/no-option-merge b/t/no-option-merge index 5f55d74..8f9a63e 100755 --- a/t/no-option-merge +++ b/t/no-option-merge @@ -4,23 +4,23 @@ printf '%s\n' > file \ "${HEAD} ours" \ same \ - ours \ + new \ "${PARENT} base" \ same \ - base \ + old \ "${TAIL}" \ same \ - theirs \ + old \ "${END} theirs" printf '%s\n' > file.expected \ same \ "${HEAD} ours" \ - ours \ + new \ "${PARENT} base" \ - base \ + old \ "${TAIL}" \ - theirs \ + old \ "${END} theirs" conflict --no-merge file diff --git a/t/no-option-merge-yes-no b/t/no-option-merge-yes-no index f351e7c..af35ed8 100755 --- a/t/no-option-merge-yes-no +++ b/t/no-option-merge-yes-no @@ -3,11 +3,11 @@ printf '%s\n' > file \ "${HEAD} ours" \ - ours \ + old \ "${PARENT} base" \ - base \ + old \ "${TAIL}" \ - theirs \ + new \ "${END} theirs" cp -- file file.expected |