Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4595:f7f2bd7f981d
test-patchbomb: fix non-existing --date parameter and filtering regexps.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 17 Jun 2007 19:39:47 +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