diff options
Diffstat (limited to 'tests.branching/workflow.script')
| -rwxr-xr-x | tests.branching/workflow.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index d2ce374f..6a365d8e 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -25,7 +25,7 @@ cd "$DATADIR/mine" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch me/readme-fix cd me/readme-fix/morphs -"$SRCDIR/scripts/test-morph" edit hello master +"$SRCDIR/scripts/test-morph" edit baserock:hello master cd ../hello echo > README yoyoyo git add README @@ -34,6 +34,6 @@ git commit -m "Fix README, yo!" --quiet cd "$DATADIR/mine" "$SRCDIR/scripts/test-morph" checkout master cd master/morphs -"$SRCDIR/scripts/test-morph" edit hello master +"$SRCDIR/scripts/test-morph" edit baserock:hello master "$SRCDIR/scripts/test-morph" merge me/readme-fix hello |