CVS_HISTORY_UPDATE_MERGED_ERR
case CVS_HISTORY_UPDATE_MERGED_ERR:
cvs_history_add(CVS_HISTORY_UPDATE_MERGED_ERR,