summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-10-23 13:34:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-23 13:34:39 -0700
commitca462804c68b5ac0936242d4938fc9273b00180d (patch)
treee5e59fe9124b4f6d5bf29d9906a23b1eb4c63afc /mergetools/tortoisemerge
parentMerge branch 'jc/ls-files-killed-optim' into maint (diff)
downloadtgif-ca462804c68b5ac0936242d4938fc9273b00180d.tar.xz
Almost 1.8.4.2 ;-)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions