commit | 3f263099fca47c278e696fbc0f0d5525318eae0a | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Tue Mar 13 12:35:53 2012 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Tue Mar 13 12:35:53 2012 -0700 |
tree | b78a78ebcf7b864dcb705ab48b398cc79766936b | |
parent | 9d9bfea8f50f17fa52ff4a1161ef1d78b71ea40a [diff] | |
parent | 4b340593551217904d794cc0a8db55db89b5b066 [diff] |
Merge branch 'ms/maint-config-error-at-eol-linecount' When "git config" diagnoses an error in a configuration file and shows the line number for the offending line, it miscounted if the error was at the end of line. By Martin Stenberg * ms/maint-config-error-at-eol-linecount: config: report errors at the EOL with correct line number Conflicts: t/t1300-repo-config.sh