diff options
| -rwxr-xr-x | tests.branching/merge-handles-unmergable-cases.script | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests.branching/merge-handles-unmergable-cases.script b/tests.branching/merge-handles-unmergable-cases.script index fd7f1478..e1ba5f9e 100755 --- a/tests.branching/merge-handles-unmergable-cases.script +++ b/tests.branching/merge-handles-unmergable-cases.script @@ -24,7 +24,9 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch baserock:morphs test/unmergable cd "$DATADIR/workspace/test/unmergable/baserock:morphs" +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum sed -ie 's/"kind": "stratum"/"kind": "chunk"/' hello-stratum.morph git commit --quiet --all -m "Unmergeable because kind has changed" + cd "$DATADIR/workspace/master/baserock:morphs" "$SRCDIR/scripts/test-morph" merge test/unmergable |