submodule: Fix t7400, t7405, t7406 for msysGit
[git/dscho.git] / advice.h
blobe5d0af782b1445b48b49cd58f481a593268c3384
1 #ifndef ADVICE_H
2 #define ADVICE_H
4 #include "git-compat-util.h"
6 extern int advice_push_nonfastforward;
7 extern int advice_status_hints;
8 extern int advice_commit_before_merge;
9 extern int advice_resolve_conflict;
10 extern int advice_implicit_identity;
11 extern int advice_detached_head;
13 int git_default_advice_config(const char *var, const char *value);
14 void advise(const char *advice, ...);
15 int error_resolve_conflict(const char *me);
16 extern void NORETURN die_resolve_conflict(const char *me);
18 #endif /* ADVICE_H */