Convert "struct cache_entry *" to "const ..." wherever possible

diff --git a/builtin/merge.c b/builtin/merge.c
index 2ebe732896c1b3bfd920941b5182b793468c0afe..74c0746a93a249ff3c48401f040d8f1396d656f0 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -889,7 +889,7 @@ static int suggest_conflicts(int renormalizing)
                die_errno(_("Could not open '%s' for writing"), filename);
        fprintf(fp, "\nConflicts:\n");
        for (pos = 0; pos < active_nr; pos++) {
-               struct cache_entry *ce = active_cache[pos];
+               const struct cache_entry *ce = active_cache[pos];
 
                if (ce_stage(ce)) {
                        fprintf(fp, "\t%s\n", ce->name);