Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 815:5a55e3011772

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Psyco was failing to call dirstate.__del__ for import Remove it.
author mpm@selenic.com
date Sat, 30 Jul 2005 09:01:59 -0800
parents 0902ffece4b4
children 5a034646e472
line wrap: on
line source

+ hg init
+ hg add a
+ hg commit -m ancestor -d 0 0
+ hg commit -m branch1 -d 0 0
+ hg co 0
+ hg commit -m branch2 -d 0 0
+ hg up -m 1
merge: warning: conflicts during merge
merging a
merging a failed!
+ hg id
32e80765d7fe+75234512624c+ tip
something else
=======
something
+ hg status
M a