Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-symlinks.out @ 5474:5d8f5ad45c12
Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 19 Oct 2007 18:25:28 -0500 |
parents | 36794dbe66a3 |
children |
line wrap: on
line source
3 files updated, 0 files merged, 0 files removed, 0 files unresolved % merge heads HG_FILE l 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) % 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