Mercurial > hg-stable
diff tests/test-help.t @ 28640:4fc640fd0026
filemerge: use revset notation for p1/p2 of local/other descriptions
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 17 Mar 2016 00:36:01 +0000 |
| parents | 3aa50c9d89a0 |
| children | d001d6d27570 |
line wrap: on
line diff
--- a/tests/test-help.t Sat Mar 26 12:55:52 2016 +0900 +++ b/tests/test-help.t Thu Mar 17 00:36:01 2016 +0000 @@ -1540,7 +1540,7 @@ to resolve these conflicts. ":local" - Uses the local (p1) version of files as the merged version. + Uses the local 'p1()' version of files as the merged version. ":merge" Uses the internal non-interactive simple merge algorithm for merging @@ -1550,11 +1550,11 @@ ":merge-local" Like :merge, but resolve all conflicts non-interactively in favor of the - local (p1) changes. + local 'p1()' changes. ":merge-other" Like :merge, but resolve all conflicts non-interactively in favor of the - other (p2) changes. + other 'p2()' changes. ":merge3" Uses the internal non-interactive simple merge algorithm for merging @@ -1563,11 +1563,11 @@ side of the merge and one for the base content. ":other" - Uses the other (p2) version of files as the merged version. + Uses the other 'p2()' version of files as the merged version. ":prompt" - Asks the user which of the local (p1) or the other (p2) version to keep - as the merged version. + Asks the user which of the local 'p1()' or the other 'p2()' version to + keep as the merged version. ":tagmerge" Uses the internal tag merge algorithm (experimental).