Mercurial > hg
view tests/test-merge5.out @ 5940:7b222815a462
Add back elipsis to [OPTION] that was stolen by 56e8a54bf71d
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 25 Jan 2008 20:17:48 +0100 |
parents | fffc8a733bf9 |
children | 4b0c9c674707 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes