diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-23 14:23:39 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-23 14:23:39 +0000 |
| commit | ddb66abddcc810db9b4cc26dae689c929042e4f3 (patch) | |
| tree | d1990495859da2be4b9cc02ef98190f35df93c0f /tests.merging/warn-if-merging-petrified-morphologies.stdout | |
| parent | 593cdfe6650d7ca1e0a8fd6742f93404ca6a76a1 (diff) | |
| parent | ec1665b75f646eec5db6078a190dab36096fe213 (diff) | |
| download | morph-ddb66abddcc810db9b4cc26dae689c929042e4f3.tar.gz | |
Merge branch 'baserock/richardmaw/S8563/bootstrap-rootfs-protection'
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'tests.merging/warn-if-merging-petrified-morphologies.stdout')
0 files changed, 0 insertions, 0 deletions