I committed a fix for this in the upstream git repository. Thanks for the report.
http://anonscm.debian.org/gitweb/?p=dpkg/dpkg.git;a=commit;h=5c233019cc770fb59671090d4a9462adb149921f ** Changed in: dpkg (Ubuntu) Status: New => Fix Committed -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/815700 Title: dpkg-mergechangelogs emits non-standard conflict markers To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/dpkg/+bug/815700/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
