My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aeb1b7f a0ad53c)
Merge branch 'tb/t0027-raciness-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2016 22:34:14 +0000 (15:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2016 22:34:14 +0000 (15:34 -0700)
The t0027 test for CRLF conversion was timing dependent and flaky.

* tb/t0027-raciness-fix:
  convert: Correct NNO tests and missing `LF will be replaced by CRLF`


Trivial merge
The core git plumbing