}
  }
  db_finalize(&q);


  /* Report on conflicts
  */
  if( nConflict ){
    printf("WARNING: %d merge conflicts.\n"
           "    ...  Use \"fossil undo\" to back out this merge\n",
  if( nConflict && !nochangeFlag ){
    printf(
      "WARNING: merge conflicts - see messages above for details.\n"
      "HINT:    The \"fossil undo\" command will back out this merge if "
           nConflict);
                "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 ){