branch | stable |
changeset 34915 | cab34bda259e |
parent 34031 | da07367d683b |
child 34932 | fd78276948b4 |
--- a/tests/test-help.t Fri Oct 20 13:44:38 2017 -0500 +++ b/tests/test-help.t Fri Oct 20 14:15:46 2017 -0700 @@ -1792,7 +1792,7 @@ accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and they will be placed in the same directory as "a.txt". - This implies permerge. Therefore, files aren't dumped, if premerge runs + This implies premerge. Therefore, files aren't dumped, if premerge runs successfully. Use :forcedump to forcibly write files out. ":fail"