summaryrefslogtreecommitdiff
path: root/check
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-10-29 16:02:42 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-10-29 18:19:26 +0000
commit1342bf9006f28a08d1b32dc8218717ebda701dc2 (patch)
tree0872d902b6ad4af6c4e238a28bc0c01624c62e0b /check
parent9e4159ba97862c78a9cfa3e3816f18c708ccba5e (diff)
downloadmorph-1342bf9006f28a08d1b32dc8218717ebda701dc2.tar.gz
Split merge tests out from the other branching tests
Merge is by far the most complex of the branching and merging commands.
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