Merge branch 'rj/doc-rev-parse'

diff --git a/builtin/merge.c b/builtin/merge.c
index 9505e7e426d302522f5e065d741fccd37290ea21..34a6166b520c8ede9973fbf497b21ac6ecb761ad 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -903,7 +903,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);