don't discard merge points (make no exception for cvs)