diff options
Diffstat (limited to 'tests.branching/merge-explicitly-named-repos.script')
| -rwxr-xr-x | tests.branching/merge-explicitly-named-repos.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/merge-explicitly-named-repos.script b/tests.branching/merge-explicitly-named-repos.script index 48705f8a..a8509045 100755 --- a/tests.branching/merge-explicitly-named-repos.script +++ b/tests.branching/merge-explicitly-named-repos.script @@ -22,7 +22,7 @@ set -eu # Create system branch. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch newbranch @@ -35,7 +35,7 @@ git add newfile.txt git commit -m foo --quiet # Merge changes to a new system branch. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch otherbranch cd otherbranch/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master |