Show More
| @@ -121,8 +121,8 b' Merge - local directory conflicts with r' | |||||
| 121 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
121 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
| 122 | [1] |
|
122 | [1] | |
| 123 | $ hg mv a/b~2ea68033e3be a/b.old |
|
123 | $ hg mv a/b~2ea68033e3be a/b.old | |
| 124 | $ readlink a/b.old |
|
124 | $ readlink.py a/b.old | |
| 125 | c |
|
125 | a/b.old -> c | |
| 126 | $ hg resolve --mark a/b |
|
126 | $ hg resolve --mark a/b | |
| 127 | (no more unresolved files) |
|
127 | (no more unresolved files) | |
| 128 | $ hg commit -m "merge link (rename link)" |
|
128 | $ hg commit -m "merge link (rename link)" | |
General Comments 0
You need to be logged in to leave comments.
Login now