hgbook

diff en/examples/mq.tarball @ 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 6f37e6a7d8cd
children
line diff
     1.1 --- a/en/examples/mq.tarball	Sun Jul 23 23:38:41 2006 -0700
     1.2 +++ b/en/examples/mq.tarball	Wed Aug 20 22:00:46 2008 +0200
     1.3 @@ -2,6 +2,7 @@
     1.4  
     1.5  cp $EXAMPLE_DIR/data/netplug-*.tar.bz2 .
     1.6  ln -s /bin/true download
     1.7 +export PATH=`pwd`:$PATH
     1.8  
     1.9  #$ name: download
    1.10