Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-push-r.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 |
comparison
equal
deleted
inserted
replaced
2177:6886bc0b77af | 2178:00205fe76993 |
---|---|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1 rev offset length base linkrev nodeid p1 p2 | 3 rev offset length base linkrev nodeid p1 p2 |
2 0 0 3 0 0 362fef284ce2 000000000000 000000000000 | 4 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
3 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 | 5 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 |
4 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 | 6 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 |
5 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 | 7 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 |