Be more user-friendly when refusing to do something because of conflict.
[git/git-svn.git] / advice.h
blobacd5fdde3fbb04acaeec19b5ab1bd463c54eb8b6
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;
11 int git_default_advice_config(const char *var, const char *value);
13 extern void NORETURN die_resolve_conflict(const char *me);
15 #endif /* ADVICE_H */