diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-10-11 17:26:17 +0000 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-10-11 17:26:17 +0000 |
| commit | e3aa8ba25847397a03a665492a0cbe4541814246 (patch) | |
| tree | 8d422fec634a308a34cb953bad3874242ae8671f /tests.branching/merge-warns-if-merging-petrified-morphologies.stdout | |
| parent | 871f8ea000d68463b0b0c68bcb3647975154334e (diff) | |
| parent | a3e9b6e86b636f67834bc38af906db9272a16b1b (diff) | |
| download | morph-e3aa8ba25847397a03a665492a0cbe4541814246.tar.gz | |
Merge remote-tracking branch 'origin/samthursfield/S4873-warn-when-merge-causes-petrification'
Renamed petrification test slightly as merge fixup.
Diffstat (limited to 'tests.branching/merge-warns-if-merging-petrified-morphologies.stdout')
| -rw-r--r-- | tests.branching/merge-warns-if-merging-petrified-morphologies.stdout | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.branching/merge-warns-if-merging-petrified-morphologies.stdout b/tests.branching/merge-warns-if-merging-petrified-morphologies.stdout new file mode 100644 index 00000000..65985486 --- /dev/null +++ b/tests.branching/merge-warns-if-merging-petrified-morphologies.stdout @@ -0,0 +1 @@ +WARNING: chunk "hello-system.hello-stratum.hello" is now petrified |