hgbook
view ja/examples/branch-named.merge.out @ 963:1dd00abb3fa9
merge with bryan - it's been a while but everything seems ok
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Sun Aug 16 03:41:39 2009 +0200 (2009-08-16) |
| 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>
15 summary: Merge