Merge branch 'tg/conflict-marker-size' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:53 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:53 +0000 (22:57 +0900)
commit04d70dd...4837a088f1e95286e328801085631e82
tree53eae27...181c6d9cce28e2f2b40d51311718a20ccopy hash to clipboard (tree)
parent7532a18...895e2560ffe8b631df9add386b84671ccopy hash to clipboard (diff)
parentb9b07ef...b2ac35684d3ee3fe98f91691d5b8642acopy hash to clipboard (diff)