equal
deleted
inserted
replaced
2458 |
2458 |
2459 If a conflict is resolved manually, please note that the changes |
2459 If a conflict is resolved manually, please note that the changes |
2460 will be overwritten if the merge is retried with resolve. The |
2460 will be overwritten if the merge is retried with resolve. The |
2461 -m/--mark switch should be used to mark the file as resolved. |
2461 -m/--mark switch should be used to mark the file as resolved. |
2462 |
2462 |
2463 You can specify a set of files to operate on, or use the -a/-all |
2463 You can specify a set of files to operate on, or use the -a/--all |
2464 switch to select all unresolved files. |
2464 switch to select all unresolved files. |
2465 |
2465 |
2466 This command also allows listing resolved files and manually |
2466 This command also allows listing resolved files and manually |
2467 indicating whether or not files are resolved. All files must be |
2467 indicating whether or not files are resolved. All files must be |
2468 marked as resolved before a commit is permitted. |
2468 marked as resolved before a commit is permitted. |