summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-01-10 14:16:49 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-10 14:16:49 -0800
commit804e97fc77b3398db5461fdd79f2f96f6acf467d (patch)
treefb6244630c63c5858608cb2bcb7b17d57b9651ea /mergetools/tortoisemerge
parentMerge the attributes fix in from maint-1.6.6 branch (diff)
downloadtgif-804e97fc77b3398db5461fdd79f2f96f6acf467d.tar.xz
Prepare for 1.7.7.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions