Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1847:94498a262d15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix annotate for removed files walk in the manifest files instead of the working dir files when running annotate
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 07 Mar 2006 20:37:27 +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