hgbook
diff ja/examples/branch-repo.merge.out @ 984:cc81b4175833
some spelling mistakes corrected in fr/appA-svn.xml
author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
---|---|
date | Wed Sep 09 15:12:25 2009 +0200 (2009-09-09) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/examples/branch-repo.merge.out Wed Sep 09 15:12:25 2009 +0200 1.3 @@ -0,0 +1,11 @@ 1.4 +$ \textbf{hg merge} 1.5 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.6 +(branch merge, don't forget to commit) 1.7 +$ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'} 1.8 +$ \textbf{hg push} 1.9 +pushing to 1.10 +searching for changes 1.11 +adding changesets 1.12 +adding manifests 1.13 +adding file changes 1.14 +added 2 changesets with 1 changes to 1 files