diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 14:25:40 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 14:25:40 +0100 |
| commit | ce1fedb4e5ab82105853c4f3a8e05fb83f62c18e (patch) | |
| tree | 6a738f64b517992eed10c3d5891bbb27840202e4 /tests.merging/conflict-stratum-field-ordering.stderr | |
| parent | fe4486c1ec69c520a2c0aee7b52c35b57808120e (diff) | |
| parent | 597f2a19363b7e91b928d814627c9236779998fb (diff) | |
| download | morph-ce1fedb4e5ab82105853c4f3a8e05fb83f62c18e.tar.gz | |
Merge remote-tracking branch 'origin/baserock/richardmaw/S11284/morphologies-by-path-v4'
Reviewed-by: Sam Thursfield
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'tests.merging/conflict-stratum-field-ordering.stderr')
| -rw-r--r-- | tests.merging/conflict-stratum-field-ordering.stderr | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests.merging/conflict-stratum-field-ordering.stderr b/tests.merging/conflict-stratum-field-ordering.stderr deleted file mode 100644 index 57aafa5a..00000000 --- a/tests.merging/conflict-stratum-field-ordering.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: merge errors were encountered. Please manually merge the target ref into test/feature in the remote system branch in each case, and then repeat the 'morph merge' operation. |