Mercurial > hg > mercurial-crew-with-dirclash
diff 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 |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/tests/test-merge-symlinks.out @@ -0,0 +1,9 @@ +% 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)