Merge "[431882] Fix IllegalStateException in case of Pseudo Add Conflict."
commit71ad70f44cf1285e3786217702065ea9a88ec2af
authorMikael Barbero <mikael.barbero@obeo.fr>
Fri, 23 May 2014 15:16:25 +0000 (23 11:16 -0400)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Fri, 23 May 2014 15:16:25 +0000 (23 11:16 -0400)
treeb69bd31f6b80a55b073929080fb8d873131e7493
parentb0d5b50808026aba9673ff898bf4b7c9b78117ac
parenta8be68491edb6a88eb68fddad2bb7be182763281
Merge "[431882] Fix IllegalStateException in case of Pseudo Add Conflict."