summaryrefslogtreecommitdiff
path: root/tests.branching/branch-creates-new-system-branch.stdout
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-26 14:43:51 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-26 14:43:51 +0100
commit0d202c2370201195d0ac5b930027a7fbcdc16cd5 (patch)
tree2911f69296c01aa4b135711a2dc7a8542ec2191d /tests.branching/branch-creates-new-system-branch.stdout
parentf171b6b27ac8d3bb7235d409cb2510516cf66b8f (diff)
downloadmorph-0d202c2370201195d0ac5b930027a7fbcdc16cd5.tar.gz
Change "checkout existing branch" test to not check out master
Checking out another branch exposed a bunch of bugs.
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch.stdout')
-rw-r--r--tests.branching/branch-creates-new-system-branch.stdout7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests.branching/branch-creates-new-system-branch.stdout b/tests.branching/branch-creates-new-system-branch.stdout
index 53256da5..6a3a9b98 100644
--- a/tests.branching/branch-creates-new-system-branch.stdout
+++ b/tests.branching/branch-creates-new-system-branch.stdout
@@ -17,8 +17,11 @@ Current origin:
* remote origin
Fetch URL: file://TMP/morphs
Push URL: file://TMP/morphs
- HEAD branch: master
- Remote branch:
+ HEAD branch (remote HEAD is ambiguous, may be one of the following):
+ alfred
+ master
+ Remote branches:
+ alfred tracked
master tracked
Local branch configured for 'git pull':
master merges with remote master