Merge branch 'sg/ci-libsvn-perl'

diff --git a/advice.h b/advice.h
index f875f8cd8da5fdb6e570770ecc7ab4461745f827..e50f02cdfeff788910699f2d34fff1c93081c24b 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -26,12 +26,13 @@ extern int advice_ignored_hook;
 extern int advice_waiting_for_editor;
 extern int advice_graft_file_deprecated;
 extern int advice_checkout_ambiguous_remote_branch_name;
+extern int advice_nested_tag;
 
 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);