Merge git://github.com/git-l10n/git-po

diff --git a/rerere.h b/rerere.h
index fcd8bc10ba587d023d174d68020a185eab0f8d40..156d2aad804527d5ae766b5381f3b5e0d2176580 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -16,7 +16,6 @@ extern void *RERERE_RESOLVED;
 extern int setup_rerere(struct string_list *, int);
 extern int rerere(int);
 extern const char *rerere_path(const char *hex, const char *file);
-extern int has_rerere_resolution(const char *hex);
 extern int rerere_forget(const char **);
 extern int rerere_remaining(struct string_list *);
 extern void rerere_clear(struct string_list *);