Mercurial > hg > mercurial-crew-with-dirclash
diff 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 |
line wrap: on
line diff
--- a/tests/test-push-r.out +++ b/tests/test-push-r.out @@ -1,3 +1,5 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 2 files removed, 0 files unresolved rev offset length base linkrev nodeid p1 p2 0 0 3 0 0 362fef284ce2 000000000000 000000000000 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000