diff --git a/doc/contribute.html b/doc/contribute.html index 32ff09bdd3..849c1e4763 100644 --- a/doc/contribute.html +++ b/doc/contribute.html @@ -473,7 +473,7 @@ Mercurial failed to merge your changes with the independent change. When this happens, Mercurial leaves both edits in the file, marked by <<<<<<< and >>>>>>>. -it is now your job to edit the file to combine them. +It is now your job to edit the file to combine them. Continuing the example, searching for those strings in flag_test.go might turn up: