Mercurial > hg
view tests/test-conflict.out @ 5780:0ae953487255
Obfuscate (instead of just escape) contact/owner in gitweb summary.
This could contain an email address.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 01 Jan 2008 17:12:37 +0100 |
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