Merge branch 'nd/worktree' into maint

diff --git a/rerere.h b/rerere.h
index 35b0fa86a3794027c5ccf898982b302849134921..f9b03862fe78b560ee606637be3b1ce972a2cc14 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -1,9 +1,9 @@
 #ifndef RERERE_H
 #define RERERE_H
 
-#include "path-list.h"
+#include "string-list.h"
 
-extern int setup_rerere(struct path_list *);
+extern int setup_rerere(struct string_list *);
 extern int rerere(void);
 
 #endif