SHA1 Hash:	16e308106f96879f9ac2812e592d8596aa9392a6
Date:	2008-08-14 05:27:43
User:	bharder
Comment:	Third time lucky? Commit changes, with merge applied only once. (so not filled with MERGE CONFLICT messages)
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/checkin.c from [ede786a568] to [425f4bbcea].

@@ -251,21 +251,14 @@
   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__
   blob_add_cr(&text);
@@ -340,14 +333,11 @@
 **
 ** 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
->>>>>>>> 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 <<<<<<<<<
+** 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.
 */
@@ -607,14 +597,11 @@
 /*
 ** COMMAND: test-import-manifest
 **
 ** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?...
 **
->>>>>>>> BEGIN MERGE CONFLICT <<<<<<<<
-**
-** Create a new version containing the specified file
->>>>>>>>> END MERGE CONFLICT <<<<<<<<<
+** 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) */
   const char* zComment; /* argument - manifest comment */