| commit | 1998e64ba331e977271a01a57e1e12dbb5a99148 | |
| author | lgoubet <laurent.goubet@obeo.fr> | |
| Wed, 17 Jul 2019 08:51:07 +0000 (17 10:51 +0200) | ||
| committer | lgoubet <laurent.goubet@obeo.fr> | |
| Wed, 17 Jul 2019 09:28:03 +0000 (17 11:28 +0200) | ||
| tree | 05981c5d7cb1ef0b1a1d01e50d9a7ad079e78726 | treesnapshot (tar.gz zip) |
| parent | c6921d7e119909e179b5920e97739a3666110b07 | commitdiff |
Fix detection of pseudo conflicts on single-valued attribute changes
Pseudo-conflicts on single-valued attribute changes was populated with
the origin as the changed value even if the left/right side was
non-null.
Change-Id: Id225da76bb381a476715c9af9581cd0bc2b9e47a
Pseudo-conflicts on single-valued attribute changes was populated with
the origin as the changed value even if the left/right side was
non-null.
Change-Id: Id225da76bb381a476715c9af9581cd0bc2b9e47a