# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1436314024 18000
# Node ID 3948cb4d0ae70e7257e47e2fd9f657c0c1af7c2b
# Parent  9086d0c1def3f76b2abaf543eea53dd92cc1b86c# Parent  97fd07e38b83f270a111b86d4bec75040c148997
merge with stable

diff -r 9086d0c1def3 -r 3948cb4d0ae7 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