summaryrefslogtreecommitdiff
path: root/BitKeeper/triggers
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-06-12 14:06:05 -0600
committerunknown <sasha@mysql.sashanet.com>2001-06-12 14:06:05 -0600
commite2029449a0c2c64b08a0a0aae07d0b18a1ea5934 (patch)
treee1219d7ed3682db15755058e41017bf44ac9bc8a /BitKeeper/triggers
parenta9e6b975fcf37c491870b3bf18493d0351ffc34f (diff)
downloadmariadb-git-e2029449a0c2c64b08a0a0aae07d0b18a1ea5934.tar.gz
BitKeeper/triggers/post-commit
fixed post-commit message mysql-test/t/check.test fixed bug from 3.23 merge BitKeeper/triggers/post-commit: fixed post-commit message mysql-test/t/check.test: fixed bug from 3.23 merge
Diffstat (limited to 'BitKeeper/triggers')
-rwxr-xr-xBitKeeper/triggers/post-commit5
1 files changed, 2 insertions, 3 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 6639366f622..68cb64266a8 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -35,12 +35,11 @@ EOF
List-ID: <bk.mysql>
From: $FROM
To: $INTERNALS
-Subject: bk commit into 3.23 tree
+Subject: bk commit into 4.0 tree
Below is the list of changes that have just been pushed into main
-3.23. repository. For information on how to access the repository
+4.0 repository. For information on how to access the repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
->>>>>>> BitKeeper/tmp/post-commit_sasha@1.8.1.3
EOF
bk changes -v -r+