hgbook
view en/examples/tour-merge-conflict.pull.out @ 226:eef2171243e8
Document the extdiff extension.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sat May 26 11:52:18 2007 -0700 (2007-05-26) |
| parents | |
| children | e281bd9a8e47 |
line source
1 $ \textbf{cd ..}
2 $ \textbf{hg clone scam-cousin scam-merge}
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 $ \textbf{cd scam-merge}
5 $ \textbf{hg pull -u ../scam-son}
6 pulling from ../scam-son
7 searching for changes
8 adding changesets
9 adding manifests
10 adding file changes
11 added 1 changesets with 1 changes to 1 files (+1 heads)
12 not updating, since new heads added
13 (run 'hg heads' to see heads, 'hg merge' to merge)