Differences From:

File src/checkin.c part of check-in [b3ec774ab7] - Fail with an error if a file is outside the checkout tree. by drh on 2008-02-08 16:24:24. [view]

To:

File src/checkin.c part of check-in [5cc845cfeb] - Rename the 'clearsign' setting to 'pgp-command'. Remove the 'safemerge' setting - safemerge is on by default and cannot be disabled. by drh on 2008-02-08 21:42:46. [view]

@@ -394,9 +394,9 @@
 
   vid = db_lget_int("checkout", 0);
   if( db_exists("SELECT 1 FROM plink WHERE pid=%d", vid) ){
     wouldFork=1;
-    if( forceFlag==0 && db_get_int("safemerge", 0)==0 ){
+    if( forceFlag==0 ){
       fossil_fatal("would fork.  use -f or --force");
     }
   }
   vfile_aggregate_checksum_disk(vid, &cksum1);