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 [48c00d0bd3] - Oops... merge typos fix w/ bdac9f7238, commited at nearly same time. by bharder on 2008-08-14 05:05:41. [view]

@@ -251,9 +251,20 @@
   if( zEditor==0 ){
     zEditor = getenv("EDITOR");
   }
   if( zEditor==0 ){
+#ifdef __MINGW32__
+>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
+#ifdef __MINGW32__
+    zEditor = "notepad";
+    zEditor = "notepad";
+#else
+>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
+    zEditor = "ed";
+>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
     zEditor = "ed";
+#endif
+>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
   }
   zFile = db_text(0, "SELECT '%qci-comment-' || hex(randomblob(6)) || '.txt'",
                    g.zLocalRoot);
 #ifdef __MINGW32__
@@ -330,9 +341,12 @@
 ** 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
+>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
+** checkout.  You will be prompted to enter a check-in comment unless
+** the "-m" option is used to specify a comment line.  You will be
+>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
 ** 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 +608,12 @@
 ** 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
+>>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
+**
+** Create a new version containing the specified file
+>>>>>>>>> END MERGE CONFLICT <<<<<<<<<
 ** 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) */