Bug#465804: mercurial: merge goes belly-up

[Vernon Tang]

reassign 465804 meld
retitle 465804 assert self.deleted_lines_pending == -1
forcemerge 479392 465804
thanks

This is a bug in Meld, not Mercurial.

signature.asc
Description: Digital signature