tests/test-merge-symlinks.out
changeset 5391 786c1206a029
child 5408 36794dbe66a3
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)