Mercurial > hg
view tests/test-merge-symlinks.out @ 11680:7fefef3ce791
convert: warn on superfluous / in paths
shlex is really a bad parser for this line-based format ...
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 20 Jul 2010 15:49:28 +0200 |
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