Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1159:b6f5a947e62e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object. Note: also change hgrequest.write(str(thing)) to hgrequest.write(thing), people should make sure they write strings.
author Vincent Wagelaar <vincent@ricardis.tudelft.nl>
date Tue, 30 Aug 2005 10:57:52 +0200
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