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