diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-04 18:16:49 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-04 18:16:49 +0100 |
| commit | 083fd4de011e0fcf4a445b38a7fa6ef8964a5ccb (patch) | |
| tree | 93447507aebf3121c5875f47088ca403c25e83d1 /tests.branching/edit-updates-stratum.script | |
| parent | 868435e5ca70efea26587431dfde7a79f648ff54 (diff) | |
| parent | 2c659a6c815bdc52f053083e5f4dd4d18451ab8a (diff) | |
| download | morph-083fd4de011e0fcf4a445b38a7fa6ef8964a5ccb.tar.gz | |
Merge branch 'jannis/rewrite-edit-command'
Diffstat (limited to 'tests.branching/edit-updates-stratum.script')
| -rwxr-xr-x | tests.branching/edit-updates-stratum.script | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script index db819088..9815fa22 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -26,8 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch # Edit chunk. -"$SRCDIR/scripts/test-morph" edit baserock:hello master +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello # See what effect the editing had. -cd newbranch/baserock:morphs -git diff +"$SRCDIR/scripts/run-git-in" "newbranch/baserock:morphs" diff |