advice.hon commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   1#ifndef ADVICE_H
   2#define ADVICE_H
   3
   4extern int advice_push_nonfastforward;
   5extern int advice_status_hints;
   6extern int advice_commit_before_merge;
   7
   8int git_default_advice_config(const char *var, const char *value);
   9
  10#endif /* ADVICE_H */