| commit | 4c120198fa6b1384fd0c5934cd71856f17ef3a30 | |
| author | Axel Richard <axel.richard@obeo.fr> | |
| Fri, 5 Jun 2015 07:59:41 +0000 (5 09:59 +0200) | ||
| committer | Laurent Goubet <laurent.goubet@obeo.fr> | |
| Wed, 17 Jun 2015 13:13:30 +0000 (17 09:13 -0400) | ||
| tree | c1532cdc1c9cccf3320436dfe799c0304884509c | treesnapshot (tar.gz zip) |
| parent | 5759f4bf52eaae35f105f5481ab4f17722ac0d6e | commitdiff |
[469355] Fix conflicts label shows wrong number of diffs
Differences in conflict who don't refined by or refine other diffs have
to be display every time (wether the UML & Diagarm Refined elements
filters are active or not).
Bug: 469355
Change-Id: I99cfc56c8cfa6f19a2ede92cd47e91e872029ddb
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Differences in conflict who don't refined by or refine other diffs have
to be display every time (wether the UML & Diagarm Refined elements
filters are active or not).
Bug: 469355
Change-Id: I99cfc56c8cfa6f19a2ede92cd47e91e872029ddb
Signed-off-by: Axel Richard <axel.richard@obeo.fr>