aboutsummaryrefslogtreecommitdiffstats
path: root/t/helper/test-mergesort.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-03-24 08:44:46 +0100
committerJunio C Hamano <gitster@pobox.com>2018-03-27 08:45:47 -0700
commit34889d3cd7e431597a6a93f26f14a81a61b7d603 (patch)
tree7c64a71f54b12da2818d10243403b05ca8793cc2 /t/helper/test-mergesort.c
parentt/helper: merge (unused) test-match-trees into test-tool (diff)
downloadgit-34889d3cd7e431597a6a93f26f14a81a61b7d603.tar.gz
git-34889d3cd7e431597a6a93f26f14a81a61b7d603.zip
t/helper: merge (unused) test-mergesort into test-tool
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/helper/test-mergesort.c')
-rw-r--r--t/helper/test-mergesort.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/helper/test-mergesort.c b/t/helper/test-mergesort.c
index 335cf6b626..c5cffaa4b7 100644
--- 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;