summaryrefslogtreecommitdiff
path: root/tests.branching/merge-with-chunk-repo-moved.stderr
diff options
context:
space:
mode:
Diffstat (limited to 'tests.branching/merge-with-chunk-repo-moved.stderr')
-rw-r--r--tests.branching/merge-with-chunk-repo-moved.stderr1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests.branching/merge-with-chunk-repo-moved.stderr b/tests.branching/merge-with-chunk-repo-moved.stderr
deleted file mode 100644
index 95fe61e6..00000000
--- a/tests.branching/merge-with-chunk-repo-moved.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.