Show More
@@ -73,7 +73,9 b' Symlink is other parent, executable is l' | |||||
73 | Update to link without local change should get us a symlink (issue3316): |
|
73 | Update to link without local change should get us a symlink (issue3316): | |
74 |
|
74 | |||
75 | $ hg up -C 0 |
|
75 | $ hg up -C 0 | |
|
76 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
76 |
$ |
|
77 | $ hg up | |
|
78 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
77 | $ hg st |
|
79 | $ hg st | |
78 |
|
80 | |||
79 | Update to link with local change should cause a merge prompt (issue3200): |
|
81 | Update to link with local change should cause a merge prompt (issue3200): |
General Comments 0
You need to be logged in to leave comments.
Login now