summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-06 22:05:23 -0800
committerJunio C Hamano <gitster@pobox.com>2019-02-06 22:05:23 -0800
commit13e263095b55c88b7af86c3c88f8b0f937eb4d5c (patch)
tree994be5d93287d7ae614c510807716c62ddfe2260 /t/t7800-difftool.sh
parentb2fc9d2fb02782a20d4370d7989be8b0a54f1017 (diff)
parentc9446f0504e4b785758eed0b63c7e00c1b7091ba (diff)
downloadgit-13e263095b55c88b7af86c3c88f8b0f937eb4d5c.tar.gz
Merge branch 'jk/autocrlf-overrides-eol-doc'
Documentation around core.crlf has been updated. * jk/autocrlf-overrides-eol-doc: docs/config: clarify "text property" in core.eol doc/gitattributes: clarify "autocrlf overrides eol"
Diffstat (limited to 't/t7800-difftool.sh')
0 files changed, 0 insertions, 0 deletions