/******************************************************************************* * Copyright (c) 2013 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Obeo - initial API and implementation *******************************************************************************/ package org.eclipse.emf.compare.internal.merge; /** * Enumeration of all possible merge operations on differences. * * @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a> */ public enum MergeOperation { /** Only mark the diff as merged without copying anything. */ MARK_AS_MERGE, /** Do a regular merge with copy. */ MERGE; }