hgbook

view en/examples/mq.tutorial.qpop.out @ 302:e281bd9a8e47

find changesets by author, revision, files, or words in the commit message
Fix sample output for test 'tour-merge-conflict'.
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 5ffee9123bbf
line source
1 $ \textbf{hg qapplied}
2 first.patch
3 second.patch
4 $ \textbf{hg qpop}
5 Now at: first.patch
6 $ \textbf{hg qseries}
7 first.patch
8 second.patch
9 $ \textbf{hg qapplied}
10 first.patch
11 $ \textbf{cat file1}
12 line 1
13 line 2
14 line 3