diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-29 16:02:42 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-29 18:19:26 +0000 |
| commit | 1342bf9006f28a08d1b32dc8218717ebda701dc2 (patch) | |
| tree | 0872d902b6ad4af6c4e238a28bc0c01624c62e0b /tests.branching/status-in-dirty-branch.script | |
| parent | 9e4159ba97862c78a9cfa3e3816f18c708ccba5e (diff) | |
| download | morph-1342bf9006f28a08d1b32dc8218717ebda701dc2.tar.gz | |
Split merge tests out from the other branching tests
Merge is by far the most complex of the branching and merging commands.
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 36ed781d..beb58ced 100755 --- a/tests.branching/status-in-dirty-branch.script +++ b/tests.branching/status-in-dirty-branch.script @@ -19,7 +19,7 @@ set -eu -. "$SRCDIR/tests.branching/setup-3rd-party-strata" +. "$SRCDIR/scripts/setup-3rd-party-strata" cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch baserock:morphs test |