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