2007-10-07 17:13:50 +04:00
|
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2007-10-06 01:01:38 +04:00
|
|
|
% merge heads
|
2007-10-07 17:13:50 +04:00
|
|
|
HG_FILE l
|
2007-10-06 01:01:38 +04:00
|
|
|
HG_MY_ISLINK 1
|
|
|
|
|
HG_OTHER_ISLINK 0
|
|
|
|
|
HG_BASE_ISLINK 0
|
|
|
|
|
merging l
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
2007-10-07 17:13:50 +04:00
|
|
|
% merge working directory
|
|
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
|
HG_FILE l2
|
|
|
|
|
HG_MY_ISLINK 1
|
|
|
|
|
HG_OTHER_ISLINK 0
|
|
|
|
|
HG_BASE_ISLINK 0
|
|
|
|
|
merging l2
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
