equal
deleted
inserted
replaced
1 updating to branch default |
|
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 pulling from ../a |
|
4 searching for changes |
|
5 adding changesets |
|
6 adding manifests |
|
7 adding file changes |
|
8 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
9 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
10 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 merging testdir/subdir/a and testdir/a to testdir/subdir/a |
|
12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
13 (branch merge, don't forget to commit) |
|
14 M testdir/subdir/a |
|
15 diff -r f7459795031e testdir/subdir/a |
|
16 --- a/testdir/subdir/a |
|
17 +++ b/testdir/subdir/a |
|
18 @@ -1,1 +1,1 @@ |
|
19 -a |
|
20 +alpha |
|