Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1314:d37a46859acd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix default clone destination The default clone wasn't working: $ hg clone hg abort: repository hg/.hg not found! This was because we were creating the destination directory from the default, then checking whether it existed to determine whether to expand the path.
author mpm@selenic.com
date Thu, 22 Sep 2005 09:47:03 -0700
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