hgbook
diff en/examples/branch-named.merge.out @ 930:71e726b7f70d
Hum, i don't think that Fink on mac is actually apt-get :)
author | Romain PELISSE <romain.pelisse@atosorigin.com> |
---|---|
date | Sun Feb 08 22:08:47 2009 +0100 (2009-02-08) |
parents | 6519f3b983b4 |
children |
line diff
1.1 --- a/en/examples/branch-named.merge.out Mon Apr 23 15:28:13 2007 -0700 1.2 +++ b/en/examples/branch-named.merge.out Sun Feb 08 22:08:47 2009 +0100 1.3 @@ -1,6 +1,6 @@ 1.4 $ \textbf{hg branch} 1.5 bar 1.6 -$ \textbf{hg merge} 1.7 +$ \textbf{hg merge foo} 1.8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.9 (branch merge, don't forget to commit) 1.10 $ \textbf{hg commit -m 'Merge'}