hgbook
annotate en/examples/mq.tutorial.qinit.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 | |
children |
rev | line source |
---|---|
bos@144 | 1 $ \textbf{hg init mq-sandbox} |
bos@144 | 2 $ \textbf{cd mq-sandbox} |
bos@144 | 3 $ \textbf{echo 'line 1' > file1} |
bos@144 | 4 $ \textbf{echo 'another line 1' > file2} |
bos@144 | 5 $ \textbf{hg add file1 file2} |
bos@144 | 6 $ \textbf{hg commit -m'first change'} |
bos@144 | 7 $ \textbf{hg qinit} |