Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 3821:2631b506e93d
Fixed indentation, spacing and a typo (debugdata->debugdate) in commands.table.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 07 Dec 2006 11:22:17 +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