From: Junio C Hamano Date: Wed, 25 Apr 2018 04:28:54 +0000 (+0900) Subject: Merge branch 'br/mergetools-guiffy' X-Git-Tag: v2.18.0-rc0~123 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/da36be5f08252cdcbfe37710990dea4c4025567a Merge branch 'br/mergetools-guiffy' "git mergetools" learned talking to guiffy. * br/mergetools-guiffy: mergetools: add support for guiffy --- da36be5f08252cdcbfe37710990dea4c4025567a