equal
deleted
inserted
replaced
29 # echo l2 > l2 |
29 # echo l2 > l2 |
30 # hg ci -qAm t3 -d '3 0' |
30 # hg ci -qAm t3 -d '3 0' |
31 |
31 |
32 $ hg init t |
32 $ hg init t |
33 $ cd t |
33 $ cd t |
34 $ hg -q pull "$TESTDIR/bundles/test-merge-symlinks.hg" |
34 $ hg -q unbundle "$TESTDIR/bundles/test-merge-symlinks.hg" |
35 $ hg up -C 3 |
35 $ hg up -C 3 |
36 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
37 |
37 |
38 Merge them and display *_ISLINK vars |
38 Merge them and display *_ISLINK vars |
39 merge heads |
39 merge heads |