mariadb/BitKeeper/triggers
unknown 198b266ab2 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix


BitKeeper/etc/ignore:
  auto-union
BitKeeper/triggers/post-commit:
  Manual merge.  Opted for the method that uses temp files for improved troubleshooting.
2006-09-13 14:16:53 -04:00
..
post-commit Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix 2006-09-13 14:16:53 -04:00
pre-commit don't allow to commit as mysqldev 2005-03-18 09:00:46 +01:00
pre-delta BitKeeper/triggers/pre-delta 2004-12-22 22:59:19 +01:00
pre-outgoing.crash-protect.pl Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1. 2006-06-09 08:40:21 +02:00
pre-resolve.crash-protect.pl Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1. 2006-06-09 08:40:21 +02:00