hgbook
view en/examples/branch-named.update.out @ 356:0db175abfaf3
some friggin' merge or something like that.
| author | jerojasro@localhost |
|---|---|
| date | Tue Oct 21 22:41:51 2008 -0500 (2008-10-21) |
| parents | |
| children |
line source
1 $ \textbf{hg update foo}
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3 $ \textbf{hg update}
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 $ \textbf{hg parent}
6 changeset:
7 branch: foo
8 user: Bryan O'Sullivan <bos@serpentine.com>
10 summary: Second commit
12 $ \textbf{hg update bar}
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved