diff options
author | unknown <igor@rurik.mysql.com> | 2005-02-11 18:14:44 -0800 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2005-02-11 18:14:44 -0800 |
commit | 2a2b0dcf9e30ece6582a5e948082f0ee12e36cd7 (patch) | |
tree | 23ac82eb0f552ae246c1574cb4665cea13b6210f /BitKeeper/triggers | |
parent | 0e9b1c1db5b489b4a1791d4ad617c5f49845bdb7 (diff) | |
parent | 6cb5736b9be935f1ce6f83f60cf6e1ebfd9987bf (diff) | |
download | mariadb-git-2a2b0dcf9e30ece6582a5e948082f0ee12e36cd7.tar.gz |
Manual merge
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/select.result:
Auto merged
Diffstat (limited to 'BitKeeper/triggers')
-rwxr-xr-x | BitKeeper/triggers/post-commit | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 30238c06b93..4e0135fa822 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -62,7 +62,6 @@ From: $FROM To: $INTERNALS Subject: bk commit into $VERSION tree ($CHANGESET)$BS $BH - Below is the list of changes that have just been committed into a local $VERSION repository of $USER. When $USER does a push these changes will be propagated to the main repository and, within 24 hours after the |