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