Mercurial > hg > mercurial-crew-with-dirclash
annotate 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 |
rev | line source |
---|---|
5391
786c1206a029
Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 % create heads |
786c1206a029
Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
786c1206a029
Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 % merge heads |
786c1206a029
Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 HG_MY_ISLINK 1 |
786c1206a029
Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 HG_OTHER_ISLINK 0 |
786c1206a029
Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
6 HG_BASE_ISLINK 0 |
786c1206a029
Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 merging l |
786c1206a029
Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
8 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
786c1206a029
Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
9 (branch merge, don't forget to commit) |