summaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-03-17 10:00:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-17 11:23:05 -0700
commit765428699a5381f113d19974720bc91b5bfeaf1d (patch)
treed154f4838eb97e2eb3539da7458c5cf70194dbc9 /git-gui/lib/mergetool.tcl
parentMerge branch 'jk/path-name-safety-2.4' into maint-2.4 (diff)
downloadtgif-765428699a5381f113d19974720bc91b5bfeaf1d.tar.xz
Git 2.4.11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions