| commit | f532d524682a7fb3c8c1b52483dd6ed52ca5708b | [log] [tgz] |
|---|---|---|
| author | Arthur Daussy <arthur.daussy@obeo.fr> | Fri Jun 01 14:19:46 2018 +0200 |
| committer | Laurent Goubet <laurent.goubet@obeo.fr> | Mon Jun 04 09:09:00 2018 -0400 |
| tree | 27afda125461d023a46de57b5d527fe6f4cc5afb | |
| parent | 1661e48676deb3a23e2f55275b2a6610923a6643 [diff] |
Do not handle "merged" files twice when JGit stages them In some cases, JGit will stage the files that are "in-sync" directly when walking over them instead of leaving this decision to the merger. In such cases, EMF Compare's handling of files through the logical model merging creates duplicate entries in the DirCache for stage 0. Bug: 535200 Change-Id: I66e62cef3425289e384a02dcdcc8a2c1349d0400