hgbook

view ja/examples/backout.manual.merge.out @ 992:8b0f1e2984d0

find changesets by author, revision, files, or words in the commit message
French translation : sync with original ch04-concepts
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Fri Sep 11 14:30:20 2009 +0200 (2009-09-11)
parents
children
line source
1 $ \textbf{hg merge}
2 merging myfile
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit)
5 $ \textbf{hg commit -m 'merged backout with previous tip'}
6 $ \textbf{cat myfile}
7 first change
8 third change