Commits

Anonymous committed a449ddf

basic: fixed a small grammar error and a typo, thanks to TJB.

Comments (0)

Files changed (1)

src/basic/index.txt

 
 What happened? A mentioned above, a "head" changeset is a changeset
 without any children. Since Alice and Bob have made *different*
-changes based on ``51b2976b01e8``, there is now two changesets in the
+changes based on ``51b2976b01e8``, there are now two changesets in the
 repository without any children. These heads are divergent lines of
 development, as can be seen in `hgtk log`:
 
    (branch merge, don't forget to commit)
 
 There were no conflicts since Alice and Bob edited different files.
-After `hg merge`, the working copy has *two* parents --- this is now you
+After `hg merge`, the working copy has *two* parents --- this is how you
 can tell that a merge is in progress if you have left your
 computer and forgotten about it. The merge is not yet committed since
 you might need to edit the files to make your code compile. Just