Mercurial > hg
view tests/test-conflict.out @ 6113:8ca25589e960
try to fix test-inherit-mode on HFS+
HFS+ doesn't like setgid directories, so avoid them in most
of the test and do a quick check that doesn't change the
output when everything's OK.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 15 Feb 2008 10:51:35 -0200 |
parents | 5af5f0f9d724 |
children | 4b0c9c674707 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging a warning: conflicts during merge. 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 <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig