X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=advice.h;h=e5d0af782b1445b48b49cd58f481a593268c3384;hb=39af78961d8e7f4c0aee73e77e9eb5b6033f79c2;hp=3244ebb5c1caffebaaf8f28ce221533c38ec29b5;hpb=43176d1e4cddc4ab2f2f7dc6f3ba10513ffc2f2b;p=git.git

diff --git a/advice.h b/advice.h
index 3244ebb5c..e5d0af782 100644
--- a/advice.h
+++ b/advice.h
@@ -11,7 +11,8 @@ extern int advice_implicit_identity;
 extern int advice_detached_head;
 
 int git_default_advice_config(const char *var, const char *value);
-
+void advise(const char *advice, ...);
+int error_resolve_conflict(const char *me);
 extern void NORETURN die_resolve_conflict(const char *me);
 
 #endif /* ADVICE_H */