Mercurial > hg
view tests/test-conflict.out @ 3590:231e61de692c
Check for at least having a final release of python 2.3.0 in setup.py
Mercurial uses features that are not in 2.3a1.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 31 Oct 2006 10:50:16 +0100 |
parents | b2ae81a7df29 |
children | 46280c004f22 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved merge: warning: conflicts during merge merging a merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 e7fe8eb3e180+0d24b7662d3e+ tip something else ======= something M a