summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-10-17 13:10:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-10-17 13:10:58 -0700
commit430cabb104103251958ac0739509e0a542e5c774 (patch)
tree707b78ab649e53b37c0cf08ee8cb339bfe994cea /Documentation/git-mergetool--lib.txt
parentGit 2.29-rc2 (diff)
parentMerge branch 'sh/blame-tooltip' (diff)
downloadtgif-430cabb104103251958ac0739509e0a542e5c774.tar.xz
Merge https://github.com/prati0100/git-gui
* https://github.com/prati0100/git-gui: git-gui: blame: prevent tool tips from sticking around after Command-Tab git-gui: improve dark mode support git-gui: fix mixed tabs and spaces; prefer tabs
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions