equal
deleted
inserted
replaced
2341 |
2341 |
2342 This command will cleanly retry unresolved file merges using file |
2342 This command will cleanly retry unresolved file merges using file |
2343 revisions preserved from the last update or merge. To attempt to |
2343 revisions preserved from the last update or merge. To attempt to |
2344 resolve all unresolved files, use the -a switch. |
2344 resolve all unresolved files, use the -a switch. |
2345 |
2345 |
|
2346 If a conflict is resolved manually, please note that the changes |
|
2347 will be overwritten if the merge is retried with resolve. The -m |
|
2348 switch should be used to mark the file as resolved. |
|
2349 |
2346 This command will also allow listing resolved files and manually |
2350 This command will also allow listing resolved files and manually |
2347 marking and unmarking files as resolved. |
2351 marking and unmarking files as resolved. All files must be marked |
|
2352 as resolved before the new commits are permitted. |
2348 |
2353 |
2349 The codes used to show the status of files are: |
2354 The codes used to show the status of files are: |
2350 U = unresolved |
2355 U = unresolved |
2351 R = resolved |
2356 R = resolved |
2352 """ |
2357 """ |