diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 18:24:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 18:24:01 (GMT) |
| commit | d3aeb31dc410a71ee41b87328f0d71996417294f (patch) | |
| tree | c9792a61c95180c0eeb4c85f5c97fbde63aa53d0 /builtin/merge.c | |
| parent | e9f1a6c189c34a7ea98cbdb92acc677a72a5b4ea (diff) | |
| parent | 9c5e6c802cde9881785b7f1b3278b97be4aabd82 (diff) | |
| download | git-d3aeb31dc410a71ee41b87328f0d71996417294f.zip git-d3aeb31dc410a71ee41b87328f0d71996417294f.tar.gz git-d3aeb31dc410a71ee41b87328f0d71996417294f.tar.bz2 | |
Merge branch 'nd/const-struct-cache-entry'
* nd/const-struct-cache-entry:
Convert "struct cache_entry *" to "const ..." wherever possible
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 9505e7e..34a6166 100644 --- 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); |