summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:32 (GMT)
commit4aeeef377347934d6f459e27f7d793de4ce384bb (patch)
treea8031c9623eac896bf474ba2158e39afc6abb5b3 /advice.h
parent2bfb182bc544214b3a15058b52b3a00c9811e3c2 (diff)
parentad6dad0996f9226b2c3a5a3c725bf2952e52d7e7 (diff)
downloadgit-4aeeef377347934d6f459e27f7d793de4ce384bb.zip
git-4aeeef377347934d6f459e27f7d793de4ce384bb.tar.gz
git-4aeeef377347934d6f459e27f7d793de4ce384bb.tar.bz2
Merge branch 'dl/no-extern-in-func-decl'
Mechanically and systematically drop "extern" from function declarlation. * dl/no-extern-in-func-decl: *.[ch]: manually align parameter lists *.[ch]: remove extern from function declarations using sed *.[ch]: remove extern from function declarations using spatch
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/advice.h b/advice.h
index cb5d361..e50f02c 100644
--- 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);