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)
"git mergetools" learned talking to guiffy.

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


Trivial merge