diff options
| author | Mattias Andrée <m@maandree.se> | 2026-09-25 19:19:15 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-09-25 19:19:15 +0200 |
| commit | 7c19d0103e46c9e59b512095693491a4093a13f3 (patch) | |
| tree | 85a9cd750a1fa317b6d3866add9d546c7df44b56 /t/all-positive-options-merge-symmetric | |
| parent | Add --symmetric (diff) | |
| download | git-rediff-1.3.tar.gz git-rediff-1.3.tar.bz2 git-rediff-1.3.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -rwxr-xr-x | t/all-positive-options-merge-symmetric (renamed from t/all-positive-options-merge) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/all-positive-options-merge b/t/all-positive-options-merge-symmetric index eeb21d0..03d3879 100755 --- a/t/all-positive-options-merge +++ b/t/all-positive-options-merge-symmetric @@ -19,5 +19,5 @@ printf '%s\n' > file.expected \ ours printf '%s' h > input -normal --merge --remove-base --reduce --interactive file 8<input 9>output +normal --merge --symmetric --remove-base --reduce --interactive file 8<input 9>output test -s output |