Mercurial > hg > pyhgsh
view tests/test-merge5.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 removing b this update spans a branch affecting the following files: b aborting update spanning branches! (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)