hgbook

view 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
line source
1 $ \textbf{hg branch}
2 bar
3 $ \textbf{hg merge}
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 (branch merge, don't forget to commit)
6 $ \textbf{hg commit -m 'Merge'}
7 $ \textbf{hg tip}
8 changeset:
9 branch: bar
10 tag: tip
11 parent:
12 parent:
13 user: Bryan O'Sullivan <bos@serpentine.com>
14
15 summary: Merge
16