aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMattias Andrée <m@maandree.se>2026-09-25 19:19:15 +0200
committerMattias Andrée <m@maandree.se>2026-09-25 19:19:15 +0200
commit7c19d0103e46c9e59b512095693491a4093a13f3 (patch)
tree85a9cd750a1fa317b6d3866add9d546c7df44b56 /Makefile
parentAdd --symmetric (diff)
downloadgit-rediff-1.3.tar.gz
git-rediff-1.3.tar.bz2
git-rediff-1.3.tar.xz
Add support for combining --merge and --symmetricHEAD1.3master
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 50591ad..1093f64 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,8 @@ TEST =\
t/no-reduce\
t/no-reduce-dashdash-dashprefix\
t/invalid-option-combinations\
+ t/combination-merge-symmetric\
+ t/combination-symmetric-merge\
t/combination-select-head-reduce\
t/combination-select-tail-reduce\
t/combination-merge-reduce\
@@ -92,10 +94,6 @@ TEST =\
t/combination-remove-base-merge-reduce\
t/combination-remove-base-symmetric-reduce\
t/combination-remove-base-reduce\
- t/all-positive-options-merge\
- t/all-positive-options-symmetric\
- t/all-positive-options-select-head\
- t/all-positive-options-select-tail\
t/combination-2-select-head\
t/combination-2-select-tail\
t/combination-2-merge\
@@ -108,6 +106,9 @@ TEST =\
t/combination-symmetric-2-no-symmetric\
t/combination-remove-base-2-no-remove-base\
t/combination-interactive-2-no-interactive\
+ t/all-positive-options-merge-symmetric\
+ t/all-positive-options-select-head\
+ t/all-positive-options-select-tail\
t/merge-short-option\
t/symmetric-short-option\
t/reduce-short-option\