summaryrefslogtreecommitdiff
path: root/check
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-26 15:15:25 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-26 15:15:25 +0100
commitca7900299dc32c7b59e896f5f4b9a38978f226a0 (patch)
treed1f15db7c51c83c1eb1fa11565adc2a295c48eec /check
parent7d7d597afd0a562916f106d259f4ff78383f9631 (diff)
parent9e18d7cc163ab95524349567fc8c4205cd0f11ce (diff)
downloadmorph-ca7900299dc32c7b59e896f5f4b9a38978f226a0.tar.gz
Add rudimentary branch+merge support
Diffstat (limited to 'check')
-rwxr-xr-xcheck1
1 files changed, 1 insertions, 0 deletions
diff --git a/check b/check
index 0b37fb58..8af05668 100755
--- a/check
+++ b/check
@@ -21,6 +21,7 @@ set -e
python setup.py clean check
cmdtest tests
+cmdtest tests.branching
if [ $(whoami) = root ] && command -v mkfs.btrfs > /dev/null
then
cmdtest tests.as-root