Show More
@@ -26,6 +26,13 b' failing merge' | |||
|
26 | 26 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
27 | 27 | [1] |
|
28 | 28 | |
|
29 | resolve -l should contain an unresolved entry | |
|
30 | ||
|
31 | $ hg resolve -l | |
|
32 | U file | |
|
33 | ||
|
34 | resolve the failure | |
|
35 | ||
|
29 | 36 | $ echo resolved > file |
|
30 | 37 | $ hg resolve -m file |
|
31 | 38 | $ hg commit -m 'resolved' |
General Comments 0
You need to be logged in to leave comments.
Login now