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, 0 insertions, 1 deletions
diff --git a/tests.merging/from-branch-not-checked-out.stderr b/tests.merging/from-branch-not-checked-out.stderr
deleted file mode 100644
index 6a9cc8a9..00000000
--- a/tests.merging/from-branch-not-checked-out.stderr
+++ /dev/null
@@ -1 +0,0 @@
-ERROR: branch baserock/newbranch must be checked out before it can be merged