Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-586.out @ 4537:2f489b00f8eb
Merge with mpm
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sun, 10 Jun 2007 21:05:01 -0700 |
parents | 720ae5085ee3 |
children |
comparison
equal
deleted
inserted
replaced
4534:cc9b79216a76 | 4537:2f489b00f8eb |
---|---|
1 adding a | |
2 adding b | |
3 pulling from ../a | |
4 searching for changes | |
5 warning: repository is unrelated | |
6 adding changesets | |
7 adding manifests | |
8 adding file changes | |
9 added 1 changesets with 1 changes to 1 files (+1 heads) | |
10 (run 'hg heads' to see heads, 'hg merge' to merge) | |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 (branch merge, don't forget to commit) | |
13 C b |