diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:54 +0900 |
| commit | da36be5f08252cdcbfe37710990dea4c4025567a (patch) | |
| tree | 01d0166ced1918c3a91bbe81895faaf45754e722 /diffcore-pickaxe.c | |
| parent | Merge branch 'nd/worktree-move' (diff) | |
| parent | mergetools: add support for guiffy (diff) | |
| download | git-da36be5f08252cdcbfe37710990dea4c4025567a.tar.gz git-da36be5f08252cdcbfe37710990dea4c4025567a.zip | |
Merge branch 'br/mergetools-guiffy'
"git mergetools" learned talking to guiffy.
* br/mergetools-guiffy:
mergetools: add support for guiffy
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions