treewide: remove cache.h inclusion due to object.h changes

[thirdparty/git.git] / rerere.h

diff --git a/rerere.h b/rerere.h
index c32d79c3bd81f1ff6e9247b77a050784b917ecfd..5d6cb638793a4982e6b1e2cd1960dbb6ce0e6dd6 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -1,6 +1,7 @@
 #ifndef RERERE_H
 #define RERERE_H
 
+#include "gettext.h"
 #include "string-list.h"
 
 struct pathspec;
@@ -24,9 +25,6 @@ struct rerere_id {
 };
 
 int setup_rerere(struct repository *,struct string_list *, int);
-#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
-#define rerere(flags) repo_rerere(the_repository, flags)
-#endif
 int repo_rerere(struct repository *, int);
 /*
  * Given the conflict ID and the name of a "file" used for replaying