Mercurial > hg

changeset 10098:c7eeec114d99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Sat, 19 Dec 2009 13:10:46 +0100
parents a223894ca044 (current diff) ffa6f2eb934e (diff)
children be442c7d84b4
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/graphlog.py	Fri Dec 18 14:27:30 2009 -0600
+++ b/hgext/graphlog.py	Sat Dec 19 13:10:46 2009 +0100
@@ -218,7 +218,8 @@
                "only_merges", "user", "only_branch", "prune", "newest_first",
                "no_merges", "include", "exclude"]:
         if op in opts and opts[op]:
-            raise util.Abort(_("--graph option is incompatible with --%s") % op)
+            raise util.Abort(_("--graph option is incompatible with --%s")
+                             % op.replace("_", "-"))
 
 def generate(ui, dag, displayer, showparents, edgefn):
     seen, state = [], asciistate()