summaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-22 14:47:41 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-22 14:47:41 +0900
commit9752ad0bb79f680bca48db7adc45338b298304b0 (patch)
treebd2422eee9e0d10902ccc4cb63aa2756ba4eaf90 /git-gui/lib/mergetool.tcl
parentSync with 2.11.4 (diff)
downloadtgif-9752ad0bb79f680bca48db7adc45338b298304b0.tar.xz
Git 2.12.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions