Skip to content

M
MariaDB
Commit 8877372f authored by unknown's avatar unknown
Browse files
Options

Manual merge 


BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
parents 35e24fcb 193919aa
Expand all Show whitespace changes
Inline Side-by-side
Showing with 261 additions and 827 deletions
BitKeeper/triggers/post-commit
View file @ 8877372f
...@@ -62,7 +62,6 @@ From: $FROM ...@@ -62,7 +62,6 @@ From: $FROM
To: $INTERNALS To: $INTERNALS
Subject: bk commit into $VERSION tree ($CHANGESET)$BS Subject: bk commit into $VERSION tree ($CHANGESET)$BS
$BH $BH
Below is the list of changes that have just been committed into a local 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 $VERSION repository of $USER. When $USER does a push these changes will
be propagated to the main repository and, within 24 hours after the be propagated to the main repository and, within 24 hours after the
......
sql/table.cc
View file @ 8877372f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7