Mercurial > public > mercurial-scm > hg-stable
diff 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 |
line wrap: on
line diff
--- a/tests/test-help.t Sat Mar 19 10:10:09 2016 -0700 +++ b/tests/test-help.t Thu Mar 17 00:36:01 2016 +0000 @@ -1539,7 +1539,7 @@ to resolve these conflicts. ":local" - Uses the local 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 @@ -1549,11 +1549,11 @@ ":merge-local" Like :merge, but resolve all conflicts non-interactively in favor of the - local changes. + local (p1) changes. ":merge-other" Like :merge, but resolve all conflicts non-interactively in favor of the - other changes. + other (p2) changes. ":merge3" Uses the internal non-interactive simple merge algorithm for merging @@ -1562,11 +1562,11 @@ side of the merge and one for the base content. ":other" - Uses the other 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 or the other 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).