diff options
| author | Philip Langer | 2016-02-29 15:32:13 +0000 |
|---|---|---|
| committer | Laurent Delaigue | 2016-04-21 06:30:13 +0000 |
| commit | 31aa7916d75a14e46f074bfc3d8dfbd303502b27 (patch) | |
| tree | 90f3d7b4b73f6d1e4efac1d6ba74651f2e11560d /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req | |
| parent | 8324c5b29fd40c72e4ddee0cc687452433e647ea (diff) | |
| download | org.eclipse.emf.compare-31aa7916d75a14e46f074bfc3d8dfbd303502b27.tar.gz org.eclipse.emf.compare-31aa7916d75a14e46f074bfc3d8dfbd303502b27.tar.xz org.eclipse.emf.compare-31aa7916d75a14e46f074bfc3d8dfbd303502b27.zip | |
[488700] Change label to Conflict [X out of Y differences unresolved]
Use Conflict [X out of Y differences unresolved] instead.
Also fixes RCPTT tests that assert the former label "Conflict [X out of
Y conflicts unresolved]".
Bug: 488700
Change-Id: Ibc75c8587da6c66212cdcc096f748453272d2a5c
Signed-off-by: Philip Langer <planger@eclipsesource.com>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req')
0 files changed, 0 insertions, 0 deletions