summaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7eb5b67..fba38b0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,6 +37,7 @@ TESTS = \
line-numbers \
merge \
mangled-numbers-abort \
+ mixed-patch-types \
munged-context-format \
need-filename \
no-newline-triggers-assert \
@@ -51,7 +52,6 @@ TESTS = \
unmodified-files
XFAIL_TESTS = \
- criss-cross \
dash-o-append
EXTRA_DIST = \