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.merging/conflict-stratum-field-ordering.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.merging/conflict-stratum-field-ordering.script')
| -rwxr-xr-x | tests.merging/conflict-stratum-field-ordering.script | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script index c96c59ab..b83358bf 100755 --- a/tests.merging/conflict-stratum-field-ordering.script +++ b/tests.merging/conflict-stratum-field-ordering.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -41,7 +41,6 @@ git push --quiet origin test/stable # Make a change in TO cd "$DATADIR/workspace/test/stable" -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum cd test:morphs cat <<EOF > "hello-stratum.morph" { @@ -69,7 +68,6 @@ git commit --quiet --all -m "Split up 'hello' chunk into runtime and devel" # Make a change in FROM that isn't very mergable cd "$DATADIR/workspace/test/feature" -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum cd test:morphs cat <<EOF > "hello-stratum.morph" { |