Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-update-reverse.out @ 2178:00205fe76993
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 02 May 2006 14:38:32 -0700 |
parents | b2ae81a7df29 |
children | 30f59f4a327e |
comparison
equal
deleted
inserted
replaced
2177:6886bc0b77af | 2178:00205fe76993 |
---|---|
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1 Main should be gone | 2 Main should be gone |
2 a | 3 a |
3 changeset: 3:ded32b0db104 | 4 changeset: 3:ded32b0db104 |
4 tag: tip | 5 tag: tip |
5 user: test | 6 user: test |