[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>
3 files changed