Mercurial > evolve
diff tests/test-tutorial.t @ 1700:05d7df73a56b mercurial-3.4
merge with stable through 3.5 branch
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 06 May 2016 00:08:31 +0200 |
| parents | 3c7f98753e37 ec6334e6627a |
| children | 6d54fd20bb81 |
line wrap: on
line diff
--- a/tests/test-tutorial.t Fri May 06 00:03:28 2016 +0200 +++ b/tests/test-tutorial.t Fri May 06 00:08:31 2016 +0200 @@ -74,7 +74,7 @@ Fixing mistake with `hg amend` -------------------------------- -We are versionning a shopping list +We are versioning a shopping list $ cd local $ cat >> shopping << EOF @@ -207,7 +207,7 @@ Getting rid of branchy history ---------------------------------- -While I was working on my list. someone made a change remotly. +While I was working on my list. someone made a change remotely. $ cd ../remote $ hg up -q