Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2115:fd77b7ee4aac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails
author Jim Meyering <list+hg@meyering.net>
date Fri, 21 Apr 2006 16:09:43 -0700
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