Mercurial > hg

changeset 30834:64a9160bf150

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: update help for `hg update` which was misleading (issue5427)
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 18 Jan 2017 03:44:19 +0530
parents bd5e9647f646
children bcad61a1f9a7
files mercurial/commands.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Jan 17 23:12:54 2017 -0500
+++ b/mercurial/commands.py	Wed Jan 18 03:44:19 2017 +0530
@@ -6481,10 +6481,10 @@
     changeset (see :hg:`help parents`).
 
     If the changeset is not a descendant or ancestor of the working
-    directory's parent, the update is aborted. With the -c/--check
-    option, the working directory is checked for uncommitted changes; if
-    none are found, the working directory is updated to the specified
-    changeset.
+    directory's parent and there are uncommitted changes, the update is
+    aborted. With the -c/--check option, the working directory is checked
+    for uncommitted changes; if none are found, the working directory is
+    updated to the specified changeset.
 
     .. container:: verbose