merge-ort, diffcore-rename: employ cached renames when possible

[thirdparty/git.git] / diffcore.h

diff --git a/diffcore.h b/diffcore.h
index cf8d4cb8617dc75d533ac142798105004ae5ec15..de01e64becaf867d0c74a505f7416535213ad5e4 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -181,7 +181,8 @@ void diffcore_rename(struct diff_options *);
 void diffcore_rename_extended(struct diff_options *options,
                              struct strintmap *relevant_sources,
                              struct strintmap *dirs_removed,
-                             struct strmap *dir_rename_count);
+                             struct strmap *dir_rename_count,
+                             struct strmap *cached_pairs);
 void diffcore_merge_broken(void);
 void diffcore_pickaxe(struct diff_options *);
 void diffcore_order(const char *orderfile);