Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1406:34cb3957d875

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: allow urls to be shorter by using shortcuts for example cs=xxx will be expanded to cmd=changeset;node=xxx
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 18 Oct 2005 20:06:34 -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