Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 2051:6a03cff2b0f5 0.8.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Try to use /usr/bin/test or /bin/test to work around missing features. The builtin "test" of Solaris 8 /bin/sh doesn't understand -nt.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Fri, 07 Apr 2006 22:31:54 +0200
parents 7544700fd931
children b2ae81a7df29
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a