summaryrefslogtreecommitdiff
path: root/tests.branching/setup-3rd-party-strata
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-09-25 15:55:16 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-09-25 19:03:37 +0100
commit11863d70955c86664466c03c1d194e6f56645050 (patch)
tree97581ab135fc9355c7295d3d5977eb6492fe6619 /tests.branching/setup-3rd-party-strata
parent6a85de8f3b427431d76db41e4e6925467fe1d868 (diff)
downloadmorph-11863d70955c86664466c03c1d194e6f56645050.tar.gz
Add merge conflict tests
Diffstat (limited to 'tests.branching/setup-3rd-party-strata')
-rw-r--r--tests.branching/setup-3rd-party-strata2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests.branching/setup-3rd-party-strata b/tests.branching/setup-3rd-party-strata
index e82d5aeb..49eca394 100644
--- a/tests.branching/setup-3rd-party-strata
+++ b/tests.branching/setup-3rd-party-strata
@@ -132,3 +132,5 @@ cd master/baserock:morphs
cd "$DATADIR/morphs"
git pull -q \
"file://$DATADIR/workspace/master/baserock:morphs" master
+
+cd "$DATADIR/workspace"