Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge-symlinks.out @ 5391:786c1206a029
Test *_ISLINK merge environment vars
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 05 Oct 2007 23:01:38 +0200 |
parents | |
children | 36794dbe66a3 |
comparison
equal
deleted
inserted
replaced
5390:36c46e20976a | 5391:786c1206a029 |
---|---|
1 % create heads | |
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
3 % merge heads | |
4 HG_MY_ISLINK 1 | |
5 HG_OTHER_ISLINK 0 | |
6 HG_BASE_ISLINK 0 | |
7 merging l | |
8 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
9 (branch merge, don't forget to commit) |