Merge branch 'rr/misc-fixes'

* rr/misc-fixes:
  convert.c: Fix return type of git_path_check_eol()
This commit is contained in:
Junio C Hamano 2011-11-21 11:03:20 -08:00
commit 0f64a5a3a2

View File

@ -658,7 +658,7 @@ static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_ch
return CRLF_GUESS;
}
static enum crlf_action git_path_check_eol(const char *path, struct git_attr_check *check)
static enum eol git_path_check_eol(const char *path, struct git_attr_check *check)
{
const char *value = check->value;