2453 |
2453 |
2454 def resolve(ui, repo, *pats, **opts): |
2454 def resolve(ui, repo, *pats, **opts): |
2455 """retry file merges from a merge or update |
2455 """retry file merges from a merge or update |
2456 |
2456 |
2457 This command can cleanly retry unresolved file merges using file |
2457 This command can cleanly retry unresolved file merges using file |
2458 revisions preserved from the last update or merge. To attempt to |
2458 revisions preserved from the last update or merge. |
2459 resolve all unresolved files, use the -a/--all switch. |
|
2460 |
2459 |
2461 If a conflict is resolved manually, please note that the changes |
2460 If a conflict is resolved manually, please note that the changes |
2462 will be overwritten if the merge is retried with resolve. The |
2461 will be overwritten if the merge is retried with resolve. The |
2463 -m/--mark switch should be used to mark the file as resolved. |
2462 -m/--mark switch should be used to mark the file as resolved. |
|
2463 |
|
2464 You can specify a set of files to operate on, or use the -a/-all |
|
2465 switch to select all unresolved files. |
2464 |
2466 |
2465 This command also allows listing resolved files and manually |
2467 This command also allows listing resolved files and manually |
2466 indicating whether or not files are resolved. All files must be |
2468 indicating whether or not files are resolved. All files must be |
2467 marked as resolved before a commit is permitted. |
2469 marked as resolved before a commit is permitted. |
2468 |
2470 |
3599 _('forcibly copy over an existing managed file')), |
3601 _('forcibly copy over an existing managed file')), |
3600 ] + walkopts + dryrunopts, |
3602 ] + walkopts + dryrunopts, |
3601 _('[OPTION]... SOURCE... DEST')), |
3603 _('[OPTION]... SOURCE... DEST')), |
3602 "resolve": |
3604 "resolve": |
3603 (resolve, |
3605 (resolve, |
3604 [('a', 'all', None, _('remerge all unresolved files')), |
3606 [('a', 'all', None, _('select all unresolved files')), |
3605 ('l', 'list', None, _('list state of files needing merge')), |
3607 ('l', 'list', None, _('list state of files needing merge')), |
3606 ('m', 'mark', None, _('mark files as resolved')), |
3608 ('m', 'mark', None, _('mark files as resolved')), |
3607 ('u', 'unmark', None, _('unmark files as resolved')), |
3609 ('u', 'unmark', None, _('unmark files as resolved')), |
3608 ('n', 'no-status', None, _('hide status prefix'))] |
3610 ('n', 'no-status', None, _('hide status prefix'))] |
3609 + walkopts, |
3611 + walkopts, |