hgbook
view en/examples/rename.divergent.merge.out @ 178:1b55292716a4
correct single typo in chpt 5 text
| author | Steve Guidon <steve.guidon@gmail.com> |
|---|---|
| date | Thu Mar 29 19:55:18 2007 +0100 (2007-03-29) |
| parents | |
| children | 8b33c890e777 |
line source
1 # See http://www.selenic.com/mercurial/bts/issue455
2 $ \textbf{cd ../orig}
3 $ \textbf{hg pull -u ../anne}
4 pulling from ../anne
5 searching for changes
6 adding changesets
7 adding manifests
8 adding file changes
9 added 1 changesets with 1 changes to 1 files
10 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
11 $ \textbf{hg pull ../bob}
12 pulling from ../bob
13 searching for changes
14 adding changesets
15 adding manifests
16 adding file changes
17 added 1 changesets with 1 changes to 1 files (+1 heads)
18 (run 'hg heads' to see heads, 'hg merge' to merge)
19 $ \textbf{hg merge}
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
21 (branch merge, don't forget to commit)
22 $ \textbf{ls}
23 bar quux