Attaching an updated debdiff, which fixes usrmerge conflicts.
See https://bugs.debian.org/1062349

I'm also uploading this as ~exp2

-- Lukas

Reply via email to