# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1261224646 -3600
# Node ID c7eeec114d99c58debe45b9f8fe7961fd46b183b
# Parent  a223894ca0440cf2beefb7962d882adaee97e348# Parent  ffa6f2eb934e08a7e3016ddd63dcd7869282a9f0
Merge with stable

diff -r a223894ca044 -r c7eeec114d99 hgext/graphlog.py
--- 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()