test-merge-symlinks.out
17 lines
| 497 B
| text/plain
|
TextLexer
/ tests / test-merge-symlinks.out
Patrick Mezard
|
r5408 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Patrick Mezard
|
r5391 | % merge heads | ||
|
Patrick Mezard
|
r5408 | HG_FILE l | ||
|
Patrick Mezard
|
r5391 | 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) | ||||
|
Patrick Mezard
|
r5408 | % 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 | ||||