Mercurial > hg > pyhgsh
view tests/test-merge5.out @ 2231:9a2f4b2e7cf1
gpg extension: Always remove temporary files created by 'hg sigcheck'.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 09 May 2006 13:26:16 +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)