hgbook
annotate ja/examples/backout.manual.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 |
rev | line source |
---|---|
foozy@708 | 1 $ \textbf{hg merge} |
foozy@708 | 2 merging myfile |
foozy@708 | 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
foozy@708 | 4 (branch merge, don't forget to commit) |
foozy@708 | 5 $ \textbf{hg commit -m 'merged backout with previous tip'} |
foozy@708 | 6 $ \textbf{cat myfile} |
foozy@708 | 7 first change |
foozy@708 | 8 third change |