Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1330:0fcde73dc3ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Give ssh a better chance of working on Windows. Switch the type of quotes used for the remote command. Open the pipe in binary mode.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 23 Sep 2005 10:30:41 -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