Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 3680:69cf255a55a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Indentation cleanups for 2956948b81f3.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 19 Nov 2006 16:09:04 +0100
parents 2956948b81f3
children 9c1737a3e254
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Nov 18 17:20:38 2006 -0200
+++ b/mercurial/commands.py	Sun Nov 19 16:09:04 2006 +0100
@@ -214,7 +214,7 @@
         p = repo.lookup(opts['parent'])
         if p not in (p1, p2):
             raise util.Abort(_('%s is not a parent of %s') %
-                               (short(p), short(node)))
+                             (short(p), short(node)))
         parent = p
     else:
         if opts['parent']: