summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-01-08 11:17:16 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-01-08 11:18:06 -0800
commitfe47c9cb5f98e305a15db24b8a9f62151ae65d8d (patch)
tree7efca0534124565539fe12f47f847fdc3980f0d3 /mergetools
parentThe final batch before -rc2 (diff)
parentMerge branch 'zs/open-current-file' (diff)
downloadtgif-fe47c9cb5f98e305a15db24b8a9f62151ae65d8d.tar.xz
Merge https://github.com/prati0100/git-gui
* https://github.com/prati0100/git-gui: git-gui: allow opening currently selected file in default app git-gui: allow closing console window with Escape git gui: fix branch name encoding error git-gui: revert untracked files by deleting them git-gui: update status bar to track operations git-gui: consolidate naming conventions
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions