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 | |
| parent | Add conflcit resultions strategies and interactive mode, and a lot of tests (diff) | |
| download | git-rediff-90d02a391562d751e299b65ad860b29eb0f66654.tar.gz git-rediff-90d02a391562d751e299b65ad860b29eb0f66654.tar.bz2 git-rediff-90d02a391562d751e299b65ad860b29eb0f66654.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/no-option-merge')
| -rwxr-xr-x | t/no-option-merge | 12 |
1 files changed, 6 insertions, 6 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 |