From 1342bf9006f28a08d1b32dc8218717ebda701dc2 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Mon, 29 Oct 2012 16:02:42 +0000
Subject: Split merge tests out from the other branching tests

Merge is by far the most complex of the branching and merging commands.
---
 check | 1 +
 1 file changed, 1 insertion(+)

(limited to 'check')

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
-- 
cgit v1.2.1