Merge branch 'tg/ls-files-debug-format-fix'

diff --git a/rebase-interactive.h b/rebase-interactive.h
index 0e5925e3aa0e3ed8164152ccc78453d58c92f78a..44dbb06311a84168d8a5970267a14ade85671a98 100644 (file)
--- a/rebase-interactive.h
+++ b/rebase-interactive.h
@@ -8,7 +8,9 @@ struct todo_list;
 void append_todo_help(unsigned keep_empty, int command_count,
                      const char *shortrevisions, const char *shortonto,
                      struct strbuf *buf);
-int edit_todo_list(struct repository *r, unsigned flags);
+int edit_todo_list(struct repository *r, struct todo_list *todo_list,
+                  struct todo_list *new_todo, const char *shortrevisions,
+                  const char *shortonto, unsigned flags);
 int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo);
 
 #endif