Merge branch 'fr_v2.17.0' of git://github.com/jnavila/git

diff --git a/split-index.h b/split-index.h
index df91c1bda8117fe7d0f25a0aaedce79370801ce0..43d66826eb712b9a9b6872458527266bd9818146 100644 (file)
--- a/split-index.h
+++ b/split-index.h
@@ -21,7 +21,7 @@ struct split_index *init_split_index(struct index_state *istate);
 void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce);
 void replace_index_entry_in_base(struct index_state *istate,
                                 struct cache_entry *old,
-                                struct cache_entry *new);
+                                struct cache_entry *new_entry);
 int read_link_extension(struct index_state *istate,
                        const void *data, unsigned long sz);
 int write_link_extension(struct strbuf *sb,