summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-12-03 00:37:56 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-03 00:37:56 -0800
commite21a8577089cb10fed5f298796ba3685010dfaef (patch)
tree2fa14353f22b01694fab0b28ab260a767323c245 /xdiff
parentMerge branch 'maint' (diff)
parentGit 1.6.5.4 (diff)
downloadtgif-e21a8577089cb10fed5f298796ba3685010dfaef.tar.xz
Merge in 1.6.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions