| commit | 31aa7916d75a14e46f074bfc3d8dfbd303502b27 | [log] [tgz] |
|---|---|---|
| author | Philip Langer <planger@eclipsesource.com> | Mon Feb 29 16:32:13 2016 +0100 |
| committer | Laurent Delaigue <laurent.delaigue@obeo.fr> | Thu Apr 21 01:30:13 2016 -0500 |
| tree | 90f3d7b4b73f6d1e4efac1d6ba74651f2e11560d | |
| parent | 8324c5b29fd40c72e4ddee0cc687452433e647ea [diff] |
[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>