aboutsummaryrefslogtreecommitdiffstats
path: root/t/t4013/diff.diff_initial..side
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-01 10:34:42 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-01 10:34:42 -0800
commitb365dafe2360c12353259432a2940c6123cd2b52 (patch)
tree3a44c43c393af77be58d0832fb07554ce08e9e8d /t/t4013/diff.diff_initial..side
parentmerge-recursive: handle NULL in add_cacheinfo() correctly (diff)
parentconvert: Correct NNO tests and missing `LF will be replaced by CRLF` (diff)
downloadgit-b365dafe2360c12353259432a2940c6123cd2b52.tar.gz
git-b365dafe2360c12353259432a2940c6123cd2b52.zip
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 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions