hgbook

annotate en/examples/filenames.filter.exclude.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
children
rev   line source
bos@144 1 $ \textbf{hg status -X '**.py' src}
bos@144 2 ? src/watcher/_watcher.c
bos@144 3 ? src/xyzzy.txt