Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 4378:e89f9afc462b
Refactor commands.serve to allow other commands to run as services.
This introduces a new function, cmdutil.service.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 27 Apr 2007 21:30:55 -0700 |
parents | 46280c004f22 |
children | 93a4e72b4f83 |
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 something else ======= something M a