summaryrefslogtreecommitdiff
path: root/tests/test-pull-branch.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-pull-branch.t')
-rw-r--r--tests/test-pull-branch.t5
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/test-pull-branch.t b/tests/test-pull-branch.t
index a9545cf..89f82c3 100644
--- a/tests/test-pull-branch.t
+++ b/tests/test-pull-branch.t
@@ -5,7 +5,6 @@
adding foo
$ hg branch branchA
marked working directory as branch branchA
- (branches are permanent and global, did you want a bookmark?)
$ echo a1 > foo
$ hg ci -ma1 # 1
@@ -33,7 +32,6 @@ Create branch B:
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch branchB
marked working directory as branch branchB
- (branches are permanent and global, did you want a bookmark?)
$ echo b1 > foo
$ hg ci -mb1 # 3
@@ -141,7 +139,6 @@ Make changes on new branch on tt
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch branchC
marked working directory as branch branchC
- (branches are permanent and global, did you want a bookmark?)
$ echo b1 > bar
$ hg ci -Am "commit on branchC on tt"
adding bar
@@ -212,5 +209,3 @@ Pull from tt
adding file changes
added 2 changesets with 2 changes to 2 files (+2 heads)
(run 'hg heads .' to see heads, 'hg merge' to merge)
-
- $ cd ..