Mercurial > hg
view tests/test-merge5.out @ 7659:25ac72ca68f6
Add Lee Cantey's installer icon to win32 installer
Add Lee Cantey's installer icon to contrib/win32 and update
mercurial.iss accordingly
author | Pascal Quantin <pascal.quantin@wavecom.com> |
---|---|
date | Thu, 15 Jan 2009 14:19:29 +0100 |
parents | 0b89315d5de2 |
children | 68a1b9d0663e |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b created new head % should abort abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes) % should succeed abort: crosses branches (use 'hg merge' or 'hg update -C')