summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-25 13:28:54 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-25 13:28:54 +0900
commitda36be5f08252cdcbfe37710990dea4c4025567a (patch)
tree01d0166ced1918c3a91bbe81895faaf45754e722 /git-gui
parentMerge branch 'nd/worktree-move' (diff)
parentmergetools: add support for guiffy (diff)
downloadtgif-da36be5f08252cdcbfe37710990dea4c4025567a.tar.xz
Merge branch 'br/mergetools-guiffy'
"git mergetools" learned talking to guiffy. * br/mergetools-guiffy: mergetools: add support for guiffy
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions