Be more user-friendly when refusing to do something because of conflict.

diff --git a/advice.h b/advice.h
index 3de5000d8cb35c1d2c31867b942a54b487bed836..acd5fdde3fbb04acaeec19b5ab1bd463c54eb8b6 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -1,10 +1,15 @@
 #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;
 
 int git_default_advice_config(const char *var, const char *value);
 
+extern void NORETURN die_resolve_conflict(const char *me);
+
 #endif /* ADVICE_H */