equal
deleted
inserted
replaced
2441 |
2441 |
2442 If a conflict is resolved manually, please note that the changes |
2442 If a conflict is resolved manually, please note that the changes |
2443 will be overwritten if the merge is retried with resolve. The |
2443 will be overwritten if the merge is retried with resolve. The |
2444 -m/--mark switch should be used to mark the file as resolved. |
2444 -m/--mark switch should be used to mark the file as resolved. |
2445 |
2445 |
2446 You can specify a set of files to operate on, or use the -a/-all |
2446 You can specify a set of files to operate on, or use the -a/--all |
2447 switch to select all unresolved files. |
2447 switch to select all unresolved files. |
2448 |
2448 |
2449 This command also allows listing resolved files and manually |
2449 This command also allows listing resolved files and manually |
2450 indicating whether or not files are resolved. All files must be |
2450 indicating whether or not files are resolved. All files must be |
2451 marked as resolved before a commit is permitted. |
2451 marked as resolved before a commit is permitted. |