Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1754:fdfe89a3962d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use repo.lock when cloning via copy, use lock.LockException when necessary
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 20 Feb 2006 01:12:03 +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