Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2090:eb40db373717

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix util.canonpath on windows. old test for absolute path was not portable. use os.path api instead.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 19 Apr 2006 09:08:45 -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