diff options
Diffstat (limited to 'advice.h')
-rw-r--r-- | advice.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,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); |