summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2001-04-15 20:15:58 +0200
committerserg@serg.mysql.com <>2001-04-15 20:15:58 +0200
commit491dc47f8cfff898978a0fdf545e5c83253fc368 (patch)
tree240442b4bbcb545ede618e29dd7eaf34c6e7e31e /BitKeeper
parent6991ee78677cc076c288332baa97befcf83d9d35 (diff)
downloadmariadb-git-491dc47f8cfff898978a0fdf545e5c83253fc368.tar.gz
bad auto-merge fixed
Diffstat (limited to 'BitKeeper')
0 files changed, 0 insertions, 0 deletions