Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1551:e793cbc8be00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to "hg heads -r FOO": Make it actually work (undefined variable 'rev'; allow to pass a rev parameter). repo.branchlookup() doesn't need a copy of heads because it doesn't modify it. Use None as default argument to heads() instead of nullid. Doc string PEPification.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 16 Nov 2005 12:56:19 +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