hgbook

annotate en/examples/mq.guards.qselect.quux.out @ 302:e281bd9a8e47

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
rev   line source
bos@144 1 $ \textbf{hg qselect quux}
bos@144 2 number of guarded, applied patches has changed from 0 to 2
bos@144 3 $ \textbf{hg qpop -a}
bos@144 4 Patch queue now empty
bos@144 5 $ \textbf{hg qpush -a}
bos@144 6 patch series already fully applied