equal
deleted
inserted
replaced
1 % create heads |
1 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
3 % merge heads |
2 % merge heads |
|
3 HG_FILE l |
4 HG_MY_ISLINK 1 |
4 HG_MY_ISLINK 1 |
5 HG_OTHER_ISLINK 0 |
5 HG_OTHER_ISLINK 0 |
6 HG_BASE_ISLINK 0 |
6 HG_BASE_ISLINK 0 |
7 merging l |
7 merging l |
8 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
8 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9 (branch merge, don't forget to commit) |
9 (branch merge, don't forget to commit) |
|
10 % merge working directory |
|
11 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
12 HG_FILE l2 |
|
13 HG_MY_ISLINK 1 |
|
14 HG_OTHER_ISLINK 0 |
|
15 HG_BASE_ISLINK 0 |
|
16 merging l2 |
|
17 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |