summaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-01 13:39:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-01 13:39:59 -0700
commitdd094c2b75401f6e1e53e7a5bbfca3c66c44f556 (patch)
treec10b122157431d5be105f48436f909bdeb345381 /git-gui/lib/mergetool.tcl
parentMerge branch 'en/rebase-root-and-fork-point-are-incompatible' (diff)
parentbugreport: drop extraneous includes (diff)
downloadtgif-dd094c2b75401f6e1e53e7a5bbfca3c66c44f556.tar.xz
Merge branch 'es/bugreport'
The "bugreport" tool. * es/bugreport: bugreport: drop extraneous includes bugreport: add compiler info bugreport: add uname info bugreport: gather git version and build info bugreport: add tool to generate debugging info help: move list_config_help to builtin/help
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions