summaryrefslogtreecommitdiff
path: root/tests.branching/edit-checkouts-existing-chunk.script
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-08-19 15:37:05 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-08-19 15:37:05 +0000
commit2dc382a2a9ae977b1158002cd2631ec5593959c1 (patch)
tree5d6aaed1754a2392e35a8f548171f4757584c77f /tests.branching/edit-checkouts-existing-chunk.script
parent89a019af088ff62459699a6efdadf8ac8fe35dd9 (diff)
parent7f25c6bea678eb82fdfe024013dac5d0c01af152 (diff)
downloadmorph-2dc382a2a9ae977b1158002cd2631ec5593959c1.tar.gz
Merge branch 'liw/restore-old-cmds'
Reviewed-by: Daniel Silverstone
Diffstat (limited to 'tests.branching/edit-checkouts-existing-chunk.script')
-rwxr-xr-xtests.branching/edit-checkouts-existing-chunk.script4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script
index a10a72d1..9584d1a3 100755
--- a/tests.branching/edit-checkouts-existing-chunk.script
+++ b/tests.branching/edit-checkouts-existing-chunk.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2012 Codethink Limited
+# Copyright (C) 2012-2013 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ cd "$DATADIR/workspace"
# Edit the hello chunk in alfred.
cd "alfred"
-"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
+"$SRCDIR/scripts/test-morph" new-edit hello-system hello-stratum hello
echo "Current branches:"
"$SRCDIR/scripts/test-morph" foreach git branch