diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-12-01 10:34:42 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-12-01 10:34:42 -0800 |
commit | b365dafe2360c12353259432a2940c6123cd2b52 (patch) | |
tree | 3a44c43c393af77be58d0832fb07554ce08e9e8d /builtin | |
parent | merge-recursive: handle NULL in add_cacheinfo() correctly (diff) | |
parent | convert: Correct NNO tests and missing `LF will be replaced by CRLF` (diff) | |
download | tgif-b365dafe2360c12353259432a2940c6123cd2b52.tar.xz |
Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf
* tb/t0027-raciness-fix:
convert: Correct NNO tests and missing `LF will be replaced by CRLF`
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions