Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1712:21dcf38e5d7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow callers to pass in the dirstate lock in most localrepo.py funcs. This makes it possible to take the lock once and commit a large number of patches, without having to read and write the dirstate for each patch.
author mason@suse.com
date Thu, 09 Feb 2006 17:18:43 -0600
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