Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-parse-date.out @ 3044:fcadf7a32425
Merge with mpm
author | Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
---|---|
date | Sun, 03 Sep 2006 06:06:02 -0400 |
parents | eef469259745 |
children | e96d2956eb4a |
comparison
equal
deleted
inserted
replaced
3043:2a4d4aecb2b4 | 3044:fcadf7a32425 |
---|---|
1 reverting a | 1 reverting a |
2 changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 | 2 changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 |
3 merging with changeset 2:99a1acecff55 | 3 merging with changeset 2:e6c3abc120e7 |
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5 (branch merge, don't forget to commit) | 5 (branch merge, don't forget to commit) |
6 abort: invalid date: 'should fail' | 6 abort: invalid date: 'should fail' |
7 transaction abort! | 7 transaction abort! |
8 rollback completed | 8 rollback completed |