Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
authorMartin Geisler <mg@lazybytes.net>
Sat, 19 Dec 2009 13:10:46 +0100
changeset 10098 c7eeec114d99
parent 10096 a223894ca044 (current diff)
parent 10097 ffa6f2eb934e (diff)
child 10100 be442c7d84b4
Merge with stable
--- 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()
Mercurial