diff options
| author | guilhem@mysql.com <> | 2005-10-12 21:58:02 +0200 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2005-10-12 21:58:02 +0200 |
| commit | 4252b546b3ef78c9f49f397142827ea2b277f086 (patch) | |
| tree | a42e8586944072e7730401a2c2d33f5f227c60c8 /BitKeeper | |
| parent | 03ed3231af42f76c79483ac585d1397bc07aac42 (diff) | |
| parent | ab05c75ea7c1483c8f07cb74bf6255e037e67228 (diff) | |
| download | mariadb-git-4252b546b3ef78c9f49f397142827ea2b277f086.tar.gz | |
Merge mysql.com:/home/mysql_src/mysql-4.1
into mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config index 81e867e514f..b68810b77ac 100644 --- a/BitKeeper/etc/config +++ b/BitKeeper/etc/config @@ -73,5 +73,6 @@ hours: [nick:]checkout:get [jonas:]checkout:get [tomas:]checkout:get +[guilhem:]checkout:get checkout:edit eoln:unix |