Differences From Artifact [ee474b9243]:

• File src/merge.c — part of check-in [76ae862ec9] at 2010-12-15 01:36:32 on branch trunk — Change the merge conflict marks to identify which part is original content and which part is the content merged in. (user: drh size: 14443)

To Artifact [01985ecbf8]:

• File src/merge.c — part of check-in [070ce24d83] at 2010-12-15 01:49:39 on branch trunk — Report the number of conflicts at the end of a merge or update and offer a hint to the user about the "fossil undo" command. (user: drh size: 14511)

434
435
436
437
438
439
440
441
442

443
444

445
446
447
448
449
450
451

    }
  }
  db_finalize(&q);


  /* Report on conflicts
  */
  if( nConflict ){
    printf("WARNING: %d merge conflicts.\n"

           "    ...  Use \"fossil undo\" to back out this merge\n",
           nConflict);

  }
  
  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
  if( !pickFlag ){

|
|
>
|
<
>

434
435
436
437
438
439
440
441
442
443
444

445
446
447
448
449
450
451
452

    }
  }
  db_finalize(&q);


  /* Report on conflicts
  */
  if( nConflict && !nochangeFlag ){
    printf(
      "WARNING: merge conflicts - see messages above for details.\n"
      "HINT:    The \"fossil undo\" command will back out this merge if "

                "you want\n");
  }
  
  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
  if( !pickFlag ){