X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=advice.h;h=3244ebb5c1caffebaaf8f28ce221533c38ec29b5;hb=7e4eb210bdf2a612d8bf4cc106d99ba190f73e3e;hp=728ab90ef17b4ebccff4ccb662108f8c5fded690;hpb=668993ff19477652d793385b4f27a62891bcd3da;p=git.git

diff --git a/advice.h b/advice.h
index 728ab90ef..3244ebb5c 100644
--- a/advice.h
+++ b/advice.h
@@ -1,11 +1,17 @@
 #ifndef ADVICE_H
 #define ADVICE_H
 
+#include "git-compat-util.h"
+
 extern int advice_push_nonfastforward;
 extern int advice_status_hints;
 extern int advice_commit_before_merge;
+extern int advice_resolve_conflict;
 extern int advice_implicit_identity;
+extern int advice_detached_head;
 
 int git_default_advice_config(const char *var, const char *value);
 
+extern void NORETURN die_resolve_conflict(const char *me);
+
 #endif /* ADVICE_H */