Merge branch 'ph/color-test'

diff --git a/match-trees.c b/match-trees.c
index 23cafe47b495ba40fbdd46eb35943be5f722a1d7..0fd6df7d6ed839eaed536bc332312c2688a6bbad 100644 (file)
--- a/match-trees.c
+++ b/match-trees.c
@@ -132,7 +132,7 @@ static void match_trees(const unsigned char *hash1,
                        const unsigned char *hash2,
                        int *best_score,
                        char **best_match,
-                       char *base,
+                       const char *base,
                        int recurse_limit)
 {
        struct tree_desc one;
@@ -301,4 +301,3 @@ void shift_tree(const unsigned char *hash1,
 
        splice_tree(hash1, add_prefix, hash2, shifted);
 }
-