Mercurial > hg

view tests/test-conflict.out @ 2074:01ee43dda681

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bundle repos to use an index tuple consistent with revlogng The bundle repo code was adding a field to the index tuple, which confused the revlogng changes. This creates a new dict instead to maintain the extra bundle info.
author mason@suse.com
date Tue, 04 Apr 2006 16:38:43 -0400
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