Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 980:5197fb9d65d5
Merge with MPM
| author | Josef "Jeff" Sipek <jeffpc@optonline.net> |
|---|---|
| date | Wed, 17 Aug 2005 22:59:47 -0500 |
| parents | 54b2a42e501e 1300271ba8de |
| children | 4f81068ed8cd |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Aug 17 22:32:47 2005 -0500 +++ b/mercurial/commands.py Wed Aug 17 22:59:47 2005 -0500 @@ -1312,7 +1312,7 @@ [('p', 'strip', 1, 'path strip'), ('b', 'base', "", 'base path')], "hg import [-p NUM] [-b BASE] PATCH..."), - "incoming": (incoming, [], 'hg incoming [SOURCE]'), + "incoming|in": (incoming, [], 'hg incoming [SOURCE]'), "^init": (init, [], 'hg init [DEST]'), "locate": (locate, @@ -1328,7 +1328,7 @@ ('p', 'patch', None, 'show patch')], 'hg log [-r REV1 [-r REV2]] [-p] [FILE]'), "manifest": (manifest, [], 'hg manifest [REV]'), - "outgoing": (outgoing, [], 'hg outgoing [DEST]'), + "outgoing|out": (outgoing, [], 'hg outgoing [DEST]'), "parents": (parents, [], 'hg parents [REV]'), "paths": (paths, [], 'hg paths [NAME]'), "^pull":