Diff
Not logged in

Differences From:

File src/checkin.c part of check-in [2ecc407d9b] - The "extra" and "clean" commands ignore the repository file if the repository happens to be within the check-out. Ticket c7b35be88. by drh on 2008-07-23 13:01:23. [view]

To:

File src/checkin.c part of check-in [4c78a18ad2] - fixed typos by bch on 2008-08-14 04:53:51. Also file src/checkin.c part of check-in [5fb14b9a0f] - Include non-sym- tags in tagview web page. Also merge mainline into tagview branch. by eric on 2008-08-21 20:59:01. Also file src/checkin.c part of check-in [16e308106f] - Third time lucky? Commit changes, with merge applied only once. (so not filled with MERGE CONFLICT messages) by bharder on 2008-08-14 05:27:43. [view]

@@ -251,9 +251,13 @@
   if( zEditor==0 ){
     zEditor = getenv("EDITOR");
   }
   if( zEditor==0 ){
+#ifdef __MINGW32__
+    zEditor = "notepad";
+#else
     zEditor = "ed";
+#endif
   }
   zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'",
                    g.zLocalRoot);
 #ifdef __MINGW32__
@@ -330,9 +334,9 @@
 ** Usage: %fossil commit ?-m COMMENT? ?--nosign? ?FILE...?
 **
 ** Create a new version containing all of the changes in the current
 ** checkout.  You will be prompted to enter a check-in comment unless
-** the "-m" option is used to specify a command line.  You will be
+** the "-m" option is used to specify a comment line.  You will be
 ** prompted for your GPG passphrase in order to sign the new manifest
 ** unless the "--nosign" options is used.  All files that have
 ** changed will be committed unless some subset of files is specified
 ** on the command line.
@@ -594,9 +598,9 @@
 ** COMMAND: test-import-manifest
 **
 ** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
 **
-** Create a new version containing containing the specified file
+** Create a new version containing the specified file
 ** revisions (if any), and child of the given PARENT version.
 */
 void import_manifest_cmd(void){
   const char* zDate;    /* argument - timestamp, as seconds since epoch (int) */