EMF Diff/Merge contribution for 2019-09

Change-Id: Ib93d79a12dfb978584ae4fc2685119b498745584
Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
1 file changed