CVS_HISTORY_UPDATE_MERGED
case CVS_HISTORY_UPDATE_MERGED:
cvs_history_add(CVS_HISTORY_UPDATE_MERGED, cf, NULL);