summaryrefslogtreecommitdiff
path: root/mergetools/araxis
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-15 20:55:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-15 20:55:12 -0700
commit16b3b2d969e88be50cb0eb9af3c56fcfcda38756 (patch)
treefabd0a688ca1cdb4c05e2cc10f8680d4b65b48ab /mergetools/araxis
parentMerge branch 'ms/patch-id-with-overlong-line' into maint (diff)
downloadtgif-16b3b2d969e88be50cb0eb9af3c56fcfcda38756.tar.xz
Prepare for 1.7.7.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/araxis')
0 files changed, 0 insertions, 0 deletions