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)
commitda36be5f08252cdcbfe37710990dea4c4025567a
tree01d0166ced1918c3a91bbe81895faaf45754e722
parent03f78e143474de2246ab06dbc26bc41245bc70f9
parent6ceb658c9905cad2436810370c6590fc260a6b64
Merge branch 'br/mergetools-guiffy'

"git mergetools" learned talking to guiffy.

* br/mergetools-guiffy:
  mergetools: add support for guiffy