diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contribute.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/contribute.html b/doc/contribute.html index 32ff09bdd..849c1e476 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 <code><<<<<<<</code> and <code>>>>>>>></code>. -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 <code>flag_test.go</code> might turn up: </p> |