# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1253217012 -7200
# Node ID 3e673c988c85ada261f9f87555c894cf1f429386
# Parent  e78967d3dd6f8544ced22102d88efbb0360fe189
commands: expand -c and -C in update error message

diff -r e78967d3dd6f -r 3e673c988c85 mercurial/commands.py
--- a/mercurial/commands.py	Thu Sep 17 21:34:05 2009 +0200
+++ b/mercurial/commands.py	Thu Sep 17 21:50:12 2009 +0200
@@ -3041,7 +3041,7 @@
         rev = node
 
     if check and clean:
-        raise util.Abort(_("cannot specify both -c and -C"))
+        raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
 
     if check:
         # we could use dirty() but we can ignore merge and branch trivia