Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4685:b5bbfa18daf7
hgeditor: Use $HG to run 'hg diff' (see 849f011dbf79)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 23 Jun 2007 20:22:17 +0200 |
parents | fffc8a733bf9 |
children |
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