Mercurial > hg
view tests/test-merge-symlinks.out @ 8063:ee8d9b93b316
convert/p4: win32 fixes
* cmd.exe does not know single quotes
* win32 does not like trailing whitespace very much. Trade test coverage for
maintenance time and drop the trailing whitespaces tests.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 13 Apr 2009 16:15:45 +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