merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 07 Jul 2015 19:07:04 -0500
changeset 25735 3948cb4d0ae7
parent 25734 9086d0c1def3 (current diff)
parent 25715 97fd07e38b83 (diff)
child 25736 8854ca3fa675
merge with stable
mercurial/commands.py
--- a/mercurial/commands.py	Sat Jul 04 10:56:37 2015 +0900
+++ b/mercurial/commands.py	Tue Jul 07 19:07:04 2015 -0500
@@ -3345,6 +3345,8 @@
     entire project history, and it does not delete them from the
     working directory.
 
+    To delete the file from the working directory, see :hg:`remove`.
+
     To undo a forget before the next commit, see :hg:`add`.
 
     .. container:: verbose