Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2163:278f9b13c39a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SunOS fix: Replaced $PWD with `pwd` under certain conditioins $PWD isn't up to date, observed on SunOS 5.8
author Sascha Wilde <wilde@sha-bang.de>
date Sun, 30 Apr 2006 19:29:57 +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