Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1407:db571bcaa35d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow empty values for url so we can have /?tip
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 18 Oct 2005 21:11:24 -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