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/invalid-option-combinations | |
| parent | Add conflcit resultions strategies and interactive mode, and a lot of tests (diff) | |
| download | git-rediff-9b98f1a9222e5e96949bf74538a97900f2d847b1.tar.gz git-rediff-9b98f1a9222e5e96949bf74538a97900f2d847b1.tar.bz2 git-rediff-9b98f1a9222e5e96949bf74538a97900f2d847b1.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 't/invalid-option-combinations')
| -rwxr-xr-x | t/invalid-option-combinations | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/t/invalid-option-combinations b/t/invalid-option-combinations index 527ce63..1a75005 100755 --- a/t/invalid-option-combinations +++ b/t/invalid-option-combinations @@ -16,5 +16,54 @@ error --select-head --merge --select-tail file error --select-head --select-tail --merge file error --select-tail --merge --select-head file error --select-tail --select-head --merge file +error --symmetric --merge file +error --merge --symmetric file +error --symmetric --select-head file +error --select-head --symmetric file +error --symmetric --select-tail file +error --select-tail --symmetric file +error --symmetric --merge --select-head file +error --symmetric --select-head --merge file +error --symmetric --merge --select-tail file +error --symmetric --select-tail --merge file +error --symmetric --select-head --select-tail file +error --symmetric --select-tail --select-head file +error --merge --symmetric --select-head file +error --select-head --symmetric --merge file +error --merge --symmetric --select-tail file +error --select-tail --symmetric --merge file +error --select-head --symmetric --select-tail file +error --select-tail --symmetric --select-head file +error --merge --select-head --symmetric file +error --select-head --merge --symmetric file +error --merge --select-tail --symmetric file +error --select-tail --merge --symmetric file +error --select-head --select-tail --symmetric file +error --select-tail --select-head --symmetric file +error --symmetric --merge --select-head --select-tail file +error --symmetric --merge --select-tail --select-head file +error --symmetric --select-head --merge --select-tail file +error --symmetric --select-head --select-tail --merge file +error --symmetric --select-tail --merge --select-head file +error --symmetric --select-tail --select-head --merge file +error --merge --symmetric --select-head --select-tail file +error --merge --symmetric --select-tail --select-head file +error --select-head --symmetric --merge --select-tail file +error --select-head --symmetric --select-tail --merge file +error --select-tail --symmetric --merge --select-head file +error --select-tail --symmetric --select-head --merge file +error --merge --select-head --symmetric --select-tail file +error --merge --select-tail --symmetric --select-head file +error --select-head --merge --symmetric --select-tail file +error --select-head --select-tail --symmetric --merge file +error --select-tail --merge --symmetric --select-head file +error --select-tail --select-head --symmetric --merge file +error --merge --select-head --select-tail --symmetric file +error --merge --select-tail --select-head --symmetric file +error --select-head --merge --select-tail --symmetric file +error --select-head --select-tail --merge --symmetric file +error --select-tail --merge --select-head --symmetric file +error --select-tail --select-head --merge --symmetric file + error --unknown-option file error '-$' file |