Mercurial > hg > pyhgsh
view tests/test-conflict.out @ 2385:5d895018ef42
The line used to ignore the setup file for win32 is a regexp but it was after a "syntax: glob"
author | Marco Barisione <marco@barisione.org> |
---|---|
date | Mon, 22 May 2006 16:47:40 +0200 |
parents | b2ae81a7df29 |
children |
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