summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-07-27 12:25:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-27 12:25:42 -0700
commitca00f80b58d679e59fc271650f68cd25cdb72b09 (patch)
treeebdb829de0c8ee0061ea15b3d2b89c0b21c36910 /mergetools/tortoisemerge
parentMerge branch 'jk/pretty-encoding-doc' into maint (diff)
downloadtgif-ca00f80b58d679e59fc271650f68cd25cdb72b09.tar.xz
Git 2.4.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions