Mercurial > hg
changeset 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 | 7efff6ce9826 |
| children | f571ea254f75 |
| files | mercurial/filemerge.py tests/test-help.t |
| diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Sat Mar 19 10:10:09 2016 -0700 +++ b/mercurial/filemerge.py Thu Mar 17 00:36:01 2016 +0000 @@ -230,8 +230,8 @@ @internaltool('prompt', nomerge) def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf): - """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.""" ui = repo.ui fd = fcd.path() @@ -268,12 +268,12 @@ @internaltool('local', nomerge) def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf): - """Uses the local version of files as the merged version.""" + """Uses the local (p1) version of files as the merged version.""" return 0, fcd.isabsent() @internaltool('other', nomerge) def _iother(repo, mynode, orig, fcd, fco, fca, toolconf): - """Uses the other version of files as the merged version.""" + """Uses the other (p2) version of files as the merged version.""" if fco.isabsent(): # local changed, remote deleted -- 'deleted' picked repo.wvfs.unlinkpath(fcd.path()) @@ -411,7 +411,7 @@ def _imergelocal(*args, **kwargs): """ Like :merge, but resolve all conflicts non-interactively in favor - of the local changes.""" + of the local (p1) changes.""" success, status = _imergeauto(localorother='local', *args, **kwargs) return success, status, False @@ -419,7 +419,7 @@ def _imergeother(*args, **kwargs): """ Like :merge, but resolve all conflicts non-interactively in favor - of the other changes.""" + of the other (p2) changes.""" success, status = _imergeauto(localorother='other', *args, **kwargs) return success, status, False
--- 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).