hgbook

view en/examples/branch-named.merge.out @ 956:61f7bf2e562d

review of french tour-basic
author Wilk
date Sun Feb 22 16:15:40 2009 +0100 (2009-02-22)
parents 6519f3b983b4
children
line source
1 $ \textbf{hg branch}
2 bar
3 $ \textbf{hg merge foo}
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>
15 summary: Merge