hgbook

diff en/mq.tex @ 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 814698eebbaf
children 53e20c92b6b6
line diff
     1.1 --- a/en/mq.tex	Fri Jan 04 22:09:00 2008 +0100
     1.2 +++ b/en/mq.tex	Wed Aug 20 22:00:46 2008 +0200
     1.3 @@ -99,7 +99,7 @@
     1.4  modifications those patches make.
     1.5  
     1.6  Quilt knows nothing about revision control tools, so it works equally
     1.7 -well on top of an unpacked tarball or a Subversion repository.
     1.8 +well on top of an unpacked tarball or a Subversion working copy.
     1.9  
    1.10  \subsection{From patchwork quilt to Mercurial Queues}
    1.11  \label{sec:mq:quilt-mq}