Skip to main content
summaryrefslogtreecommitdiffstats
blob: 8cdce36fd28425c56f62de9ea0bd8e834ebc8236 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
/*
 * (non-javadoc)
 * Copyright (c) 2006, 2012 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
 */
/**
 * Provides merging service for EMF Compare.
 * <p>
 * Clients should always use 
 * {@link org.eclipse.emf.compare.diff.merge.service.MergerService} when merging
 * differences. 
 * </p>
 * 
 * @since 0.8
 */
package org.eclipse.emf.compare.diff.merge.service;

Back to the top