# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1360623054 28800
# Node ID f12804d3ff801b989cb2aab1aad93047a8db46f1
# Parent  fb9d1c2805ff709bf9dc5729791eb62f8b5b2f23# Parent  5e63a85299bae89ad00a9b0863a537019eb386a5
Merge

diff -r fb9d1c2805ff -r f12804d3ff80 mercurial/commands.py
--- 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