Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1547:4dea10839201

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
close .hg/hgrc after writing the default values on clone this fix a bug where Dircleanup did not work because the file was still open
author TK Soh <teekaysoh@yahoo.com>
date Tue, 15 Nov 2005 20:35:10 +0100
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