Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-excessive-merge.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 | 8feb33c2d153 |
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, 0 files removed, 0 files unresolved | |
| 3 (branch merge, don't forget to commit) | |
| 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 6 (branch merge, don't forget to commit) | |
| 1 changeset: 4:f6c172c6198c | 7 changeset: 4:f6c172c6198c |
| 2 tag: tip | 8 tag: tip |
| 3 parent: 1:448a8c5e42f1 | 9 parent: 1:448a8c5e42f1 |
| 4 parent: 2:7c5dc2e857f2 | 10 parent: 2:7c5dc2e857f2 |
| 5 user: test | 11 user: test |