Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-newbranch.out @ 4410:bbc97d419b16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add fast-forward branch merging
author Brendan Cully <brendan@kublai.com>
date Sun, 06 May 2007 20:27:45 -0700
parents 0d51eb296fb9
children d9d177ef748a
line wrap: on
line diff
--- a/tests/test-newbranch.out
+++ b/tests/test-newbranch.out
@@ -84,3 +84,18 @@ 67ec16bde7f1575d523313b9bca000f6a6f12dca
 bf1bc2f45e83
 4909a3732169 (foo) tip
 abort: branch foobar not found
+% fastforward merge
+adding ff
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+foo
+changeset:   6:9cc105113eeb
+branch:      foo
+tag:         tip
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     Merge ff into foo
+
+a
+ff