Merge branch 'dl/no-extern-in-func-decl'

diff --git a/advice.h b/advice.h
index cb5d36161453dc4c3a8de8e6afd3b3ac28394eaa..e50f02cdfeff788910699f2d34fff1c93081c24b 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -32,7 +32,7 @@ int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))
 void advise(const char *advice, ...);
 int error_resolve_conflict(const char *me);
-extern void NORETURN die_resolve_conflict(const char *me);
+void NORETURN die_resolve_conflict(const char *me);
 void NORETURN die_conclude_merge(void);
 void detach_advice(const char *new_name);