Merge branch 'ml/userdiff-rust'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Jun 2019 18:24:08 +0000 (11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Jun 2019 18:24:08 +0000 (11:24 -0700)
commita41dad4...30c8291893b5c5b013457499855ec9b5
tree21b5ec0...fedc07883eee26ca823d516477e4fc10copy hash to clipboard (tree)
parenta6a95cd...b46e48e5fe06bdbb0839a67ebeef4682copy hash to clipboard (diff)
parent33be7b3...c23fbbaf75197f6150323e0d4c84bf12copy hash to clipboard (diff)
Documentation/gitattributes.txt
userdiff.c