Merge branch 'tg/conflict-marker-size'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:49 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:49 +0000 (13:53 -0700)
commit4dd0c4a...4cf9500f3197062da1a82a83a867fb94
treed5d55d6...667be9b7fb1c0688c12e567d60bc1219copy hash to clipboard (tree)
parent6709a11...cc59ed15e0f878bf80b9e4e2af24da3ecopy hash to clipboard (diff)
parentb9b07ef...b2ac35684d3ee3fe98f91691d5b8642acopy hash to clipboard (diff)