Mercurial > hg
comparison tests/test-help.t @ 28578:66d085e55ecd
filemerge: indicate that local/other are p1/p2
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 17 Mar 2016 00:36:01 +0000 |
| parents | b7a31068cc80 |
| children | 3aa50c9d89a0 |
comparison
equal
deleted
inserted
replaced
| 28577:7efff6ce9826 | 28578:66d085e55ecd |
|---|---|
| 1537 Rather than attempting to merge files that were modified on both | 1537 Rather than attempting to merge files that were modified on both |
| 1538 branches, it marks them as unresolved. The resolve command must be used | 1538 branches, it marks them as unresolved. The resolve command must be used |
| 1539 to resolve these conflicts. | 1539 to resolve these conflicts. |
| 1540 | 1540 |
| 1541 ":local" | 1541 ":local" |
| 1542 Uses the local version of files as the merged version. | 1542 Uses the local (p1) version of files as the merged version. |
| 1543 | 1543 |
| 1544 ":merge" | 1544 ":merge" |
| 1545 Uses the internal non-interactive simple merge algorithm for merging | 1545 Uses the internal non-interactive simple merge algorithm for merging |
| 1546 files. It will fail if there are any conflicts and leave markers in the | 1546 files. It will fail if there are any conflicts and leave markers in the |
| 1547 partially merged file. Markers will have two sections, one for each side | 1547 partially merged file. Markers will have two sections, one for each side |
| 1548 of merge. | 1548 of merge. |
| 1549 | 1549 |
| 1550 ":merge-local" | 1550 ":merge-local" |
| 1551 Like :merge, but resolve all conflicts non-interactively in favor of the | 1551 Like :merge, but resolve all conflicts non-interactively in favor of the |
| 1552 local changes. | 1552 local (p1) changes. |
| 1553 | 1553 |
| 1554 ":merge-other" | 1554 ":merge-other" |
| 1555 Like :merge, but resolve all conflicts non-interactively in favor of the | 1555 Like :merge, but resolve all conflicts non-interactively in favor of the |
| 1556 other changes. | 1556 other (p2) changes. |
| 1557 | 1557 |
| 1558 ":merge3" | 1558 ":merge3" |
| 1559 Uses the internal non-interactive simple merge algorithm for merging | 1559 Uses the internal non-interactive simple merge algorithm for merging |
| 1560 files. It will fail if there are any conflicts and leave markers in the | 1560 files. It will fail if there are any conflicts and leave markers in the |
| 1561 partially merged file. Marker will have three sections, one from each | 1561 partially merged file. Marker will have three sections, one from each |
| 1562 side of the merge and one for the base content. | 1562 side of the merge and one for the base content. |
| 1563 | 1563 |
| 1564 ":other" | 1564 ":other" |
| 1565 Uses the other version of files as the merged version. | 1565 Uses the other (p2) version of files as the merged version. |
| 1566 | 1566 |
| 1567 ":prompt" | 1567 ":prompt" |
| 1568 Asks the user which of the local or the other version to keep as the | 1568 Asks the user which of the local (p1) or the other (p2) version to keep |
| 1569 merged version. | 1569 as the merged version. |
| 1570 | 1570 |
| 1571 ":tagmerge" | 1571 ":tagmerge" |
| 1572 Uses the internal tag merge algorithm (experimental). | 1572 Uses the internal tag merge algorithm (experimental). |
| 1573 | 1573 |
| 1574 ":union" | 1574 ":union" |