changeset 18667:f12804d3ff80

Merge
author Bryan O'Sullivan <bryano@fb.com>
date Mon, 11 Feb 2013 14:50:54 -0800
parents fb9d1c2805ff (current diff) 5e63a85299ba (diff)
children 4034b8d551b1 56f8522c3591
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Feb 09 19:02:45 2013 +0200
+++ b/mercurial/commands.py	Mon Feb 11 14:50:54 2013 -0800
@@ -2106,7 +2106,9 @@
         ] + commitopts2,
          _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
-    """create arbitrary obsolete marker"""
+    """create arbitrary obsolete marker
+
+    With no arguments it it display the list obsolescence marker."""
     def parsenodeid(s):
         try:
             # We do not use revsingle/revrange functions here to accept