Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3722:5191e2299d63
Make sed expression in test-committer compatible with GNU sed 3.x.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 29 Nov 2006 08:49:45 +0100 |
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