diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-11-21 11:03:20 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-11-21 11:03:20 -0800 |
commit | 0f64a5a3a25c9a161c4e70ae031c885a6284ddb8 (patch) | |
tree | e89ea6181133513b8022ccc901a494bd12faef7a | |
parent | 05bab3ea283d687d7981583aa87e03279f3b1484 (diff) | |
parent | ef563de6dd6997b913d5c87f6caf09db7e44bdcd (diff) | |
download | git-0f64a5a3a25c9a161c4e70ae031c885a6284ddb8.tar.gz |
Merge branch 'rr/misc-fixes'
* rr/misc-fixes:
convert.c: Fix return type of git_path_check_eol()
-rw-r--r-- | convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |