Mercurial > hg
view tests/test-conflict.out @ 5462:91a522a69c13
convert: svn -- fix tags handling
They were simply not detected.
author | Kirill Smelkov <kirr@landau.phys.spbu.ru> |
---|---|
date | Sat, 13 Oct 2007 15:25:11 +0400 |
parents | 93a4e72b4f83 |
children | 5af5f0f9d724 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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 <<<<<<< my something else ======= something >>>>>>> other M a