summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-14 23:21:48 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-14 23:21:48 -0700
commit5957f043d3690aa0cb17fef30c1aef0a30ec1025 (patch)
tree47c0fe52f5668bfce50bd9661706d81314f8e53b /xdiff
parentMerge branch 'lt/logopt' into next (diff)
parentGIT v1.3.0-rc4 (diff)
downloadtgif-5957f043d3690aa0cb17fef30c1aef0a30ec1025.tar.xz
Merge branch 'master' into next
* master: GIT v1.3.0-rc4
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions