commit | bd36b76f01bc32430bff925e5ca1fb2525a15af6 | [log] [tgz] |
---|---|---|
author | Laurent Delaigue <laurent.delaigue@obeo.fr> | Tue Feb 24 10:50:49 2015 +0100 |
committer | Axel RICHARD <axel.richard@obeo.fr> | Tue Feb 24 11:00:15 2015 -0500 |
tree | 7f87898be566644991e72a970fe2471e3b1b5b16 | |
parent | d5a1d68b68126e8e0b65d349ce3b89ff0c4638a5 [diff] |
[458818] NPE when conflict on multi-valued attrib. (move vs delete) This can be tested with conflict/data/c5/ and conflict/data/c2 test folders. Bug: 458818 Change-Id: I5602226549d940c01ffb240b00aa3156bb4bba33 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>