Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 10212:3ab391dd5ec5
Merge with stable.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 05 Jan 2010 22:41:39 +0100 |
parents | f5e55f1ca927 43f8abcec42d |
children | e3e41e5e7ff4 |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Jan 05 10:20:28 2010 -0600 +++ b/mercurial/commands.py Tue Jan 05 22:41:39 2010 +0100 @@ -3575,7 +3575,7 @@ "^pull": (pull, [('u', 'update', None, - _('update to new tip if changesets were pulled')), + _('update to new branch head if changesets were pulled')), ('f', 'force', None, _('run even when remote repository is unrelated')), ('r', 'rev', [], @@ -3688,7 +3688,7 @@ "unbundle": (unbundle, [('u', 'update', None, - _('update to new tip if changesets were unbundled'))], + _('update to new branch head if changesets were unbundled'))], _('[-u] FILE...')), "^update|up|checkout|co": (update,