Merge branch 'rs/merge-add-strategies-simplification' into maint

diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c
index d446b8eaca727dfa9c1b0928f2b8c9af286f2702..e9395028630bf26390366065aa07bc7b2827eb73 100644 (file)
--- a/t/helper/test-match-trees.c
+++ b/t/helper/test-match-trees.c
@@ -1,7 +1,7 @@
 #include "cache.h"
 #include "tree.h"
 
-int main(int ac, char **av)
+int cmd_main(int ac, const char **av)
 {
        struct object_id hash1, hash2, shifted;
        struct tree *one, *two;