560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
|
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
|
-
+
|
fossil_warning("WARNING: %d unmanaged files were overwritten",
nOverwrite);
}
if( nMerge ){
fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
}
if( isFork ){
fossil_warning("WARNING: fork detected, please do a \"fossil merge\"");
fossil_warning("WARNING: ambigeous branch, please do a \"fossil merge\"");
}
}
/*
** Clean up the mid and pid VFILE entries. Then commit the changes.
*/
if( dryRunFlag ){
|