Mercurial > hg
view tests/test-conflict.out @ 2904:57b88b86a845
Replace qdel/qfold -f option with -k/--keep.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 14 Aug 2006 11:24:19 -0700 |
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