Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1834:24881eaebee3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes running 'hg serve' with Windows executable and no explicit template path configured. PY2EXE executables don't support __file__ but do place the directory of the shared code library into sys.prefix. Fixes bug 152.
author Lee Cantey <lcantey@gmail.com>
date Fri, 03 Mar 2006 13:41:12 -0800
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