Mercurial > hg
view tests/test-merge5.out @ 7953:8c6f823efcc9
Correct a bug on date formats with '>' or '<' accompanied by space characters.
author | Justin Peng <justin.peng.sw@gmail.com> |
---|---|
date | Wed, 01 Apr 2009 09:11:00 -0700 |
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')