diff mercurial/commands.py @ 11886:73112cb2a6d7

Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Sun, 15 Aug 2010 18:13:46 +0200
parents b9d316bcc013 2da0cf99b642
children 4532c44bb62d
line wrap: on
line diff
--- a/mercurial/commands.py	Sun Aug 15 17:42:44 2010 +0200
+++ b/mercurial/commands.py	Sun Aug 15 18:13:46 2010 +0200
@@ -726,8 +726,10 @@
     If you are committing the result of a merge, do not provide any
     filenames or -I/-X filters.
 
-    If no commit message is specified, the configured editor is
-    started to prompt you for a message.
+    If no commit message is specified, Mercurial starts your
+    configured editor where you can enter a message. In case your
+    commit fails, you will find a backup of your message in
+    ``.hg/last-message.txt``.
 
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
@@ -874,7 +876,7 @@
      - empty to denote the default parent.
 
     All string valued-elements are either strictly alphanumeric, or must
-    be enclosed in double quotes ("..."), with "\" as escape character.
+    be enclosed in double quotes ("..."), with "\\" as escape character.
 
     Note that the --overwritten-file and --appended-file options imply the
     use of "HGMERGE=internal:local" during DAG buildup.