hgbook

annotate ja/examples/branch-named.merge.out @ 983:5e1e70fcdfdb

find changesets by author, revision, files, or words in the commit message
Corrected some errors.
- Indentation problems
- Syntax errors (missing </para>,...)
- French mistakes
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Tue Sep 08 23:42:42 2009 +0200 (2009-09-08)
parents
children
rev   line source
foozy@708 1 $ \textbf{hg branch}
foozy@708 2 bar
foozy@708 3 $ \textbf{hg merge}
foozy@708 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
foozy@708 5 (branch merge, don't forget to commit)
foozy@708 6 $ \textbf{hg commit -m 'Merge'}
foozy@708 7 $ \textbf{hg tip}
foozy@708 8 changeset:
foozy@708 9 branch: bar
foozy@708 10 tag: tip
foozy@708 11 parent:
foozy@708 12 parent:
foozy@708 13 user: Bryan O'Sullivan <bos@serpentine.com>
foozy@708 14
foozy@708 15 summary: Merge
foozy@708 16