hgbook

view en/examples/mq.tutorial.qnew.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 006bbad1f190
children
line source
1 $ \textbf{hg tip}
2 changeset:
3 tag: tip
4 user: Bryan O'Sullivan <bos@serpentine.com>
6 summary: first change
8 $ \textbf{hg qnew first.patch}
9 $ \textbf{hg tip}
10 changeset:
11 tag: qtip
12 tag: first.patch
13 tag: tip
14 tag: qbase
15 user: Bryan O'Sullivan <bos@serpentine.com>
17 summary: [mq]: first.patch
19 $ \textbf{ls .hg/patches}
20 first.patch series status