Show More
@@ -2252,6 +2252,10 b' def resolve(ui, repo, *pats, **opts):' | |||||
2252 | revision preserved at the last update or merge to cleanly retry |
|
2252 | revision preserved at the last update or merge to cleanly retry | |
2253 | the file merge attempt. With no file or options specified, this |
|
2253 | the file merge attempt. With no file or options specified, this | |
2254 | command will attempt to resolve all unresolved files. |
|
2254 | command will attempt to resolve all unresolved files. | |
|
2255 | ||||
|
2256 | The codes used to show the status of files are: | |||
|
2257 | U = unresolved | |||
|
2258 | R = resolved | |||
2255 | """ |
|
2259 | """ | |
2256 |
|
2260 | |||
2257 | if len([x for x in opts if opts[x]]) > 1: |
|
2261 | if len([x for x in opts if opts[x]]) > 1: |
General Comments 0
You need to be logged in to leave comments.
Login now