sequencer: do not squash 'reword' commits when we hit conflicts

diff --git a/advice.h b/advice.h
index 70568fa7922d8aea403e415f9b9b554a88ace293..9f5064e82a862e6daaabe3f23ea9ea896aad87e6 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -21,6 +21,7 @@ extern int advice_rm_hints;
 extern int advice_add_embedded_repo;
 extern int advice_ignored_hook;
 extern int advice_waiting_for_editor;
+extern int advice_graft_file_deprecated;
 
 int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))