work around an obnoxious bash "safety feature" on OpenBSD

diff --git a/advice.h b/advice.h
index 728ab90ef17b4ebccff4ccb662108f8c5fded690..9b7a3ad1ca126cb882e87d400820043043061f78 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -1,11 +1,16 @@
 #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;
 
 int git_default_advice_config(const char *var, const char *value);
 
+extern void NORETURN die_resolve_conflict(const char *me);
+
 #endif /* ADVICE_H */