Mercurial > hg
changeset 12804:e0e8b123b75e stable
merge-tools: fixed typos
Spotted by Patrick Mézard.
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Thu, 21 Oct 2010 21:34:30 +0200 |
| parents | a6a0698960cc |
| children | cae1c187abd4 |
| files | doc/gendoc.py mercurial/help/merge-tools.txt |
| diffstat | 2 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/gendoc.py Thu Oct 21 21:26:32 2010 +0200 +++ b/doc/gendoc.py Thu Oct 21 21:34:30 2010 +0200 @@ -97,7 +97,7 @@ ui.write("\n") section(ui, _("Extensions")) - ui.write(_("This section contains help for extensions that is distributed " + ui.write(_("This section contains help for extensions that are distributed " "together with Mercurial. Help for other extensions is available " "in the help system.")) ui.write("\n\n"
--- a/mercurial/help/merge-tools.txt Thu Oct 21 21:26:32 2010 +0200 +++ b/mercurial/help/merge-tools.txt Thu Oct 21 21:34:30 2010 +0200 @@ -7,8 +7,9 @@ The merge tools are used both for :hg:`resolve` and :hg:`merge`. -Usually, the merge tool tries to automatically, by combining all the -non-overlapping changes that occurred separately in the two different +Usually, the merge tool tries to automatically reconcile the files by +combining all the non-overlapping changes that occurred separately in +the two different evolutions of the same initial base file. Furthermore, some interactive merge programs make it easier to manually resolve conflicting merges, either in a graphical way, or by inserting some @@ -41,10 +42,10 @@ ``internal:dump`` Creates three versions of the files to merge, containing the contents of local, other and base. These files can then be used to - perform a merge manually. If the file merged is name ``a.txt``, - these files will accordingly be named ``a.txt.local``, + perform a merge manually. If the file to be merged is named + ``a.txt``, these files will accordingly be named ``a.txt.local``, ``a.txt.other`` and ``a.txt.base`` and they will be placed in the - same directory as the file to merge. + same directory as ``a.txt``. How Mercurial decides which merge program to use @@ -77,8 +78,8 @@ to merge the files using a simple merge algorithm first, to see if they can be merged without conflicts. Only if there are conflicting changes Mercurial will actually execute the merge program. Whether - to use the simple merge algorithm first can be controlled be the - premerge setting of the merge tool, which is enabled by default + to use the simple merge algorithm first can be controlled by the + premerge setting of the merge tool. Premerge is enabled by default unless the file is binary or symlink. See the merge-tools and ui sections of hgrc(5) for details on