difftool --no-index: error out on --dir-diff (and don't crash)

diff --git a/t/helper/test-mergesort.c b/t/helper/test-mergesort.c
index 335cf6b6264cdaf9563736fbcfa40e7a3006a432..c5cffaa4b73ff52b2f166231ceb4a77b24ee8cef 100644 (file)
--- a/t/helper/test-mergesort.c
+++ b/t/helper/test-mergesort.c
@@ -1,3 +1,4 @@
+#include "test-tool.h"
 #include "cache.h"
 #include "mergesort.h"
 
@@ -22,7 +23,7 @@ static int compare_strings(const void *a, const void *b)
        return strcmp(x->text, y->text);
 }
 
-int cmd_main(int argc, const char **argv)
+int cmd__mergesort(int argc, const char **argv)
 {
        struct line *line, *p = NULL, *lines = NULL;
        struct strbuf sb = STRBUF_INIT;