Revision ed6ce4382b5cb34e98ca3db2f19de82a037da322 authored by Junio C Hamano on 26 March 2012, 19:10:05 UTC, committed by Junio C Hamano on 26 March 2012, 19:10:05 UTC
* ms/maint-config-error-at-eol-linecount: config: report errors at the EOL with correct line number
advice.h
#ifndef ADVICE_H
#define ADVICE_H
#include "git-compat-util.h"
extern int advice_push_nonfastforward;
extern int advice_status_hints;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
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 */
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...