diff options
Diffstat (limited to 'tests.merging/move-chunk-repo.stderr')
| -rw-r--r-- | tests.merging/move-chunk-repo.stderr | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests.merging/move-chunk-repo.stderr b/tests.merging/move-chunk-repo.stderr deleted file mode 100644 index 95fe61e6..00000000 --- a/tests.merging/move-chunk-repo.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: chunk hello was added within this branch and subsequently edited. This is not yet supported: refusing to merge. |