Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-newbranch @ 4410:bbc97d419b16
Add fast-forward branch merging
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sun, 06 May 2007 20:27:45 -0700 |
parents | 0d51eb296fb9 |
children |
line wrap: on
line diff
--- a/tests/test-newbranch +++ b/tests/test-newbranch @@ -51,4 +51,15 @@ hg id hg branch foobar hg up +echo % fastforward merge +hg branch ff +echo ff > ff +hg ci -Am'fast forward' -d '1000000 0' +hg up foo +hg merge ff +hg branch +hg commit -m'Merge ff into foo' -d '1000000 0' +hg parents +hg manifest + exit 0