summaryrefslogtreecommitdiff
path: root/tests.merging/from-branch-not-checked-out.stderr
diff options
context:
space:
mode:
Diffstat (limited to 'tests.merging/from-branch-not-checked-out.stderr')
-rw-r--r--tests.merging/from-branch-not-checked-out.stderr1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.merging/from-branch-not-checked-out.stderr b/tests.merging/from-branch-not-checked-out.stderr
new file mode 100644
index 00000000..6a9cc8a9
--- /dev/null
+++ b/tests.merging/from-branch-not-checked-out.stderr
@@ -0,0 +1 @@
+ERROR: branch baserock/newbranch must be checked out before it can be merged