Differences From Artifact [ad61f89cc2]:

• File src/merge.c — part of check-in [fda7c2c63d] at 2011-10-17 16:01:18 on branch trunk — Fixed an incorrect const qualifier (caught by clang). (user: stephan size: 17753) [more...]

To Artifact [6ad7b5363f]:

• File src/merge.c — part of check-in [c80ee413ab] at 2011-10-17 23:12:59 on branch trunk — Fix typo in warning message. (user: drh size: 17752) [more...]

507
508
509
510
511
512
513
514
515
516
517
518
519
520
521

  /* Report on conflicts
  */
  if( !nochangeFlag ){
    if( nConflict ){
      fossil_print("WARNING: %d merge conflicts", nConflict);
    }
    if( nOverwrite ){
      fossil_warning("WARNING: %d unmanaged files where overwritten",
                     nOverwrite);
    }
  }

  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */

|

507
508
509
510
511
512
513
514
515
516
517
518
519
520
521

  /* Report on conflicts
  */
  if( !nochangeFlag ){
    if( nConflict ){
      fossil_print("WARNING: %d merge conflicts", nConflict);
    }
    if( nOverwrite ){
      fossil_warning("WARNING: %d unmanaged files were overwritten",
                     nOverwrite);
    }
  }

  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */