Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2014-09-09 14:13:13 +0000
committerMikael Barbero2014-10-09 14:39:35 +0000
commite39698b4f20d73041f6cf17af49f633c5094d835 (patch)
tree3efaae93d942ed4d35f2bdd8bf2ed0abb3f9a881 /plugins/org.eclipse.emf.compare.uml2.tests
parentdfaf575c7d788d4579fd163f0f7bf748a7def461 (diff)
downloadorg.eclipse.emf.compare-e39698b4f20d73041f6cf17af49f633c5094d835.tar.gz
org.eclipse.emf.compare-e39698b4f20d73041f6cf17af49f633c5094d835.tar.xz
org.eclipse.emf.compare-e39698b4f20d73041f6cf17af49f633c5094d835.zip
[443695] Update Conflict Icon & Label
In case where all differences under a conflict have been resolved, then the conflict icon turned to gray, and the label shows [resolved]. In case where differences still to be merge, the label shows the number. Bug:443695 Change-Id: I485d99553e304fc77dd8e01e02e3f3a36560ab58 Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests')
0 files changed, 0 insertions, 0 deletions

Back to the top