| commit | da36be5f08252cdcbfe37710990dea4c4025567a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Apr 2018 04:28:54 +0000 (25 13:28 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Apr 2018 04:28:54 +0000 (25 13:28 +0900) | ||
| tree | 01d0166ced1918c3a91bbe81895faaf45754e722 | treesnapshot (tar.gz zip) |
| parent | 03f78e143474de2246ab06dbc26bc41245bc70f9 | commitdiff |
| parent | 6ceb658c9905cad2436810370c6590fc260a6b64 | commitdiff |
Merge branch 'br/mergetools-guiffy'
"git mergetools" learned talking to guiffy.
* br/mergetools-guiffy:
mergetools: add support for guiffy
"git mergetools" learned talking to guiffy.
* br/mergetools-guiffy:
mergetools: add support for guiffy