Merge branch 'br/mergetools-guiffy'
"git mergetools" learned talking to guiffy. * br/mergetools-guiffy: mergetools: add support for guiffy
Junio C Hamano committed
Apr 25, 2018 at 13:28 UTC
da36be5f08252cdcbfe37710990dea4c4025567a
No changes.