Mercurial > hg
view tests/test-merge-symlinks.out @ 5404:67d3daa8ac42
convert: quote "^" to avoid windows using it as an escape char.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 06 Oct 2007 21:19:06 +0200 |
parents | 786c1206a029 |
children | 36794dbe66a3 |
line wrap: on
line source
% create heads 0 files updated, 0 files merged, 1 files removed, 0 files unresolved % merge heads 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)