From 1342bf9006f28a08d1b32dc8218717ebda701dc2 Mon Sep 17 00:00:00 2001 From: Sam Thursfield 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. --- tests.branching/workflow-separate-stratum-repos.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests.branching/workflow-separate-stratum-repos.script') diff --git a/tests.branching/workflow-separate-stratum-repos.script b/tests.branching/workflow-separate-stratum-repos.script index d8be404c..6f77672e 100755 --- a/tests.branching/workflow-separate-stratum-repos.script +++ b/tests.branching/workflow-separate-stratum-repos.script @@ -22,7 +22,7 @@ set -eu -. "$SRCDIR/tests.branching/setup-3rd-party-strata" +. "$SRCDIR/scripts/setup-3rd-party-strata" # Make a change to the system # FIXME: we should try and build it, too -- cgit v1.2.1