summaryrefslogtreecommitdiff
path: root/check
diff options
context:
space:
mode:
Diffstat (limited to 'check')
-rwxr-xr-xcheck1
1 files changed, 1 insertions, 0 deletions
diff --git a/check b/check
index b9ed2d56..7288e55f 100755
--- a/check
+++ b/check
@@ -22,6 +22,7 @@ set -e
python setup.py clean check
cmdtest tests
cmdtest tests.branching
+cmdtest tests.merging
if [ $(whoami) = root ] && command -v mkfs.btrfs > /dev/null
then
cmdtest tests.as-root