hgbook

diff en/examples/mq.tutorial.qnew.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 006bbad1f190
children
line diff
     1.1 --- a/en/examples/mq.tutorial.qnew.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/mq.tutorial.qnew.out	Wed Aug 20 22:00:46 2008 +0200
     1.3 @@ -14,7 +14,7 @@
     1.4  tag:         qbase
     1.5  user:        Bryan O'Sullivan <bos@serpentine.com>
     1.6  
     1.7 -summary:     New patch: first.patch
     1.8 +summary:     [mq]: first.patch
     1.9  
    1.10  $ \textbf{ls .hg/patches}
    1.11  first.patch  series  status