From 1342bf9006f28a08d1b32dc8218717ebda701dc2 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 29 Oct 2012 16:02:42 +0000 Subject: Split merge tests out from the other branching tests Merge is by far the most complex of the branching and merging commands. --- tests.branching/merge-error-cases.stderr | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tests.branching/merge-error-cases.stderr (limited to 'tests.branching/merge-error-cases.stderr') diff --git a/tests.branching/merge-error-cases.stderr b/tests.branching/merge-error-cases.stderr deleted file mode 100644 index 6a9cc8a9..00000000 --- a/tests.branching/merge-error-cases.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: branch baserock/newbranch must be checked out before it can be merged -- cgit v1.2.1