Merge git://repo.or.cz/git-gui

diff --git a/match-trees.c b/match-trees.c
index d7e29c4d1d3e44c85e0eeb28040e8ea945090594..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;