SHA1 Hash:	8e147fdbac452ff3d92faa44bd26f678e3c00efb
Date:	2009-12-19 03:16:52
User:	drh
Comment:	Fix a segfault that occurs on an attempt to merge binary files. Ticket 3f2cb270b2f6.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/merge3.c from [61efa8a333] to [bbe357cf65].    [diff]