hgbook
diff en/examples/filenames.glob.range.out @ 302:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
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 | 7f07aca44938 |
children |
line diff
1.1 --- a/en/examples/filenames.glob.range.out Mon Mar 26 21:58:24 2007 -0700 1.2 +++ b/en/examples/filenames.glob.range.out Wed Aug 20 22:00:46 2008 +0200 1.3 @@ -1,7 +1,3 @@ 1.4 $ \textbf{hg status 'glob:**[nr-t]'} 1.5 -A examples/simple.py 1.6 ? MANIFEST.in 1.7 -? examples/performant.py 1.8 -? src/watcher/_watcher.c 1.9 -? src/watcher/watcher.py 1.10 ? src/xyzzy.txt