Mercurial > hg
comparison tests/test-help.t @ 34915:cab34bda259e stable
help: fix typo in hg merge documentation
| author | Joe Blaylock <jrbl@google.com> |
|---|---|
| date | Fri, 20 Oct 2017 14:15:46 -0700 |
| parents | da07367d683b |
| children | fd78276948b4 |
comparison
equal
deleted
inserted
replaced
| 34914:5539a6acfd77 | 34915:cab34bda259e |
|---|---|
| 1790 local, other and base. These files can then be used to perform a merge | 1790 local, other and base. These files can then be used to perform a merge |
| 1791 manually. If the file to be merged is named "a.txt", these files will | 1791 manually. If the file to be merged is named "a.txt", these files will |
| 1792 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and | 1792 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and |
| 1793 they will be placed in the same directory as "a.txt". | 1793 they will be placed in the same directory as "a.txt". |
| 1794 | 1794 |
| 1795 This implies permerge. Therefore, files aren't dumped, if premerge runs | 1795 This implies premerge. Therefore, files aren't dumped, if premerge runs |
| 1796 successfully. Use :forcedump to forcibly write files out. | 1796 successfully. Use :forcedump to forcibly write files out. |
| 1797 | 1797 |
| 1798 ":fail" | 1798 ":fail" |
| 1799 Rather than attempting to merge files that were modified on both | 1799 Rather than attempting to merge files that were modified on both |
| 1800 branches, it marks them as unresolved. The resolve command must be used | 1800 branches, it marks them as unresolved. The resolve command must be used |