Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1057:2fd15d743b3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add grep command. It currently searches all revs of every matching file. I'll change this soon so that it can still do this, but it will not be the default behaviour. Many options are unimplemented. There's only one output mode. Binary files are not handled yet.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 25 Aug 2005 02:00:03 -0700
parents 5a034646e472
children 67a28636ea64
line wrap: on
line source

merging for b
merging b
This is file b1
merging for b
merging b
merging for b
merging b