Mercurial > hg > pyhgsh
view tests/test-conflict.out @ 882:bc9ca4d51d23
Merge IPv6 fix.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 10 Aug 2005 12:36:34 -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