-------------- next part -------------- A non-text attachment was scrubbed... Name: hgmerge-binary-handling.diff Type: text/x-patch Size: 1501 bytes Desc: not available URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20051102/63a1ae48/attachment-0001.bin>