diff options
author | Laurent Delaigue | 2015-09-16 15:56:57 +0000 |
---|---|---|
committer | Laurent Delaigue | 2015-09-18 06:49:19 +0000 |
commit | 92e3df0cb5f57f5c81f324ee599834cc31deb047 (patch) | |
tree | 0a18aebe46a5deea3c840733320bcd39b647f900 /plugins/org.eclipse.emf.compare.tests | |
parent | c08604342db8739550949ba51c21a46ed9445d51 (diff) | |
download | org.eclipse.emf.compare-92e3df0cb5f57f5c81f324ee599834cc31deb047.tar.gz org.eclipse.emf.compare-92e3df0cb5f57f5c81f324ee599834cc31deb047.tar.xz org.eclipse.emf.compare-92e3df0cb5f57f5c81f324ee599834cc31deb047.zip |
[477607] Fix erroneous conflict detection on uncontrol
Bug: 477607
Change-Id: Ie27efabd1596c74df9fe2290e039284c129a363f
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests')
0 files changed, 0 insertions, 0 deletions