| commit | e934c67b6683c1bd504646647b7ee04ee0d9e15b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jun 2014 18:26:50 +0000 (6 11:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jun 2014 18:26:50 +0000 (6 11:26 -0700) | ||
| tree | aedcc0fc5925cafdd9150701fbceb19f1b5fa901 | treesnapshot (tar.gz zip) |
| parent | ee8213951a36cefabed7dd653965cffb6aee628e | commitdiff |
| parent | 4d4813a52f3722854a54bab046f4abfec13ef6ae | commitdiff |
Merge branch 'bc/blame-crlf-test'
If a file contained CRLF line endings in a repository with
core.autocrlf=input, then blame always marked lines as "Not
Committed Yet", even if they were unmodified.
* bc/blame-crlf-test:
blame: correctly handle files regardless of autocrlf
If a file contained CRLF line endings in a repository with
core.autocrlf=input, then blame always marked lines as "Not
Committed Yet", even if they were unmodified.
* bc/blame-crlf-test:
blame: correctly handle files regardless of autocrlf
| builtin/blame.c | diff1 | diff2 | blobhistory |