diff options
Diffstat (limited to 'tests.merging/conflict-chunks.stderr')
| -rw-r--r-- | tests.merging/conflict-chunks.stderr | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.merging/conflict-chunks.stderr b/tests.merging/conflict-chunks.stderr new file mode 100644 index 00000000..57aafa5a --- /dev/null +++ b/tests.merging/conflict-chunks.stderr @@ -0,0 +1 @@ +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. |