diff docs/from-mq.rst @ 1697:093c445fd86a mercurial-3.6

merge with stable through 3.7 branch dropped the topic test and updated output with some minor difference Hg: Enter commit message. Lines beginning with 'HG:' are removed.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 05 May 2016 23:51:35 +0200
parents d1c5d80b2ace
children 5a796d753427
line wrap: on
line diff
--- a/docs/from-mq.rst	Wed Feb 10 23:44:00 2016 +0000
+++ b/docs/from-mq.rst	Thu May 05 23:51:35 2016 +0200
@@ -85,7 +85,7 @@
 ..   $ hg record -m 'feature A'
 ..   # oups, I forgot some stuff
 ..   $ hg record babar.py
-..   $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A'
+..   $ hg amend -c .^ # .^ refer to "working directory parent, here 'feature A'
 
 .. note: refresh is an alias for amend