diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-06-09 14:00:26 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-06-09 14:00:26 +0000 |
| commit | b6f37209fc277883c983b1602d3a98b4045f6dee (patch) | |
| tree | 7e502b0a9abe2c736b9f8260a8e984fc91e20539 /tests.branching/status-in-dirty-branch.script | |
| parent | e88455c62914ed70b439b37c2ba64a446cb295c3 (diff) | |
| parent | 051ed7f0753ac292964019bb00929380f98b2191 (diff) | |
| download | morph-b6f37209fc277883c983b1602d3a98b4045f6dee.tar.gz | |
Merge branch 'baserock/ps/simple-edit-syntax'
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'tests.branching/status-in-dirty-branch.script')
| -rwxr-xr-x | tests.branching/status-in-dirty-branch.script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/status-in-dirty-branch.script b/tests.branching/status-in-dirty-branch.script index 7fdd8862..37fca97b 100755 --- a/tests.branching/status-in-dirty-branch.script +++ b/tests.branching/status-in-dirty-branch.script @@ -35,7 +35,7 @@ cd "$DATADIR/workspace" # Make the branch have some interesting changes and pitfalls cd branch1 -"$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello +"$SRCDIR/scripts/test-morph" edit hello cd test/stratum2-hello git checkout -q master |