Merge branch 'br/mergetools-guiffy'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2018 04:28:54 +0000 (13:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2018 04:28:54 +0000 (13:28 +0900)
commitda36be5...08252cdcbfe37710990dea4c4025567a
tree01d0166...ed1918c3a91bbe81895faaf45754e722copy hash to clipboard (tree)
parent03f78e1...3474de2246ab06dbc26bc41245bc70f9copy hash to clipboard (diff)
parent6ceb658...9905cad2436810370c6590fc260a6b64copy hash to clipboard (diff)