Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1643:747c8d03bd29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bash_completion: ignore hg help error messages They are usually not useful when you're completing stuff and end up cluttering the screen.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 27 Jan 2006 12:15:39 +0100
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