Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1146:9061f79c6c6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
grep: extend functionality, add man page entry, add unit test. walkchangerevs now returns a two-tuple. Its behaviour is also extensively commented. The annotate command's getname function has been factored out to a new function, trimname, so it can be shared between annotate and grep. The behaviour of grep has been beefed up, so that it now performs a number of useful functions.
author bos@serpentine.internal.keyresearch.com
date Mon, 29 Aug 2005 10:05:49 -0700
parents 5a034646e472
children 7544700fd931
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a