hgbook
annotate en/examples/mq.tarball.download.out @ 302:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
Fix test itself as well (now requires 'hg resolve').
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed Aug 20 22:00:46 2008 +0200 (2008-08-20) |
| parents | 006bbad1f190 |
| children |
| rev | line source |
|---|---|
| bos@144 | 1 $ \textbf{download netplug-1.2.5.tar.bz2} |
| bos@144 | 2 $ \textbf{tar jxf netplug-1.2.5.tar.bz2} |
| bos@144 | 3 $ \textbf{cd netplug-1.2.5} |
| bos@144 | 4 $ \textbf{hg init} |
| bos@144 | 5 $ \textbf{hg commit -q --addremove --message netplug-1.2.5} |
| bos@144 | 6 $ \textbf{cd ..} |
| bos@144 | 7 $ \textbf{hg clone netplug-1.2.5 netplug} |
| hg@297 | 8 updating working directory |
| bos@144 | 9 18 files updated, 0 files merged, 0 files removed, 0 files unresolved |