rerere: recalculate conflict ID when unresolved conflict is committed

diff --git a/advice.h b/advice.h
index 9f5064e82a862e6daaabe3f23ea9ea896aad87e6..7e9377864f8fca1051ce3fd27f3def62b8d234eb 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -17,6 +17,7 @@ extern int advice_implicit_identity;
 extern int advice_detached_head;
 extern int advice_set_upstream_failure;
 extern int advice_object_name_warning;
+extern int advice_amworkdir;
 extern int advice_rm_hints;
 extern int advice_add_embedded_repo;
 extern int advice_ignored_hook;