diff options
| author | Mattias Andrée <m@maandree.se> | 2026-09-24 23:19:13 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-09-24 23:19:13 +0200 |
| commit | 9b98f1a9222e5e96949bf74538a97900f2d847b1 (patch) | |
| tree | 468ab35cb2ac75ef1c48d76189520ee9bad23495 /t/no-option-merge-yes-no | |
| parent | Add conflcit resultions strategies and interactive mode, and a lot of tests (diff) | |
| download | git-rediff-1.2.tar.gz git-rediff-1.2.tar.bz2 git-rediff-1.2.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -rwxr-xr-x | t/no-option-merge-yes-no | 6 |
1 files changed, 3 insertions, 3 deletions
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 |