Artifact dd770f3592b0a0a6310269064a928fb1deb32e15:

Ticket change [dd770f3592] - Fixed ticket 3f2cb270b2: Assertion on "fossil update" when trying to merge a binary file plus 2 other changes by drh on 2009-12-19 03:17:46.

0000: 44 20 32 30 30 39 2d 31 32 2d 31 39 54 30 33 3a  D 2009-12-19T03:
0010: 31 37 3a 34 36 0a 4a 20 2b 63 6f 6d 6d 65 6e 74  17:46.J +comment
0020: 20 5c 6e 5c 6e 3c 68 72 3e 3c 69 3e 64 72 68 5c   \n\n<hr><i>drh\
0030: 73 61 64 64 65 64 5c 73 6f 6e 5c 73 32 30 30 39  sadded\son\s2009
0040: 2d 31 32 2d 31 39 5c 73 30 33 3a 31 37 3a 34 36  -12-19\s03:17:46
0050: 3a 3c 2f 69 3e 3c 62 72 3e 5c 6e 53 65 65 5c 73  :</i><br>\nSee\s
0060: 63 68 65 63 6b 2d 69 6e 5c 73 5b 38 65 31 34 37  check-in\s[8e147
0070: 66 64 62 61 63 34 35 32 66 66 33 64 39 32 66 61  fdbac452ff3d92fa
0080: 61 34 34 62 64 32 36 66 36 37 38 65 33 63 30 30  a44bd26f678e3c00
0090: 65 66 62 5d 2e 0a 4a 20 72 65 73 6f 6c 75 74 69  efb]..J resoluti
00a0: 6f 6e 20 46 69 78 65 64 0a 4a 20 73 74 61 74 75  on Fixed.J statu
00b0: 73 20 46 69 78 65 64 0a 4b 20 33 66 32 63 62 32  s Fixed.K 3f2cb2
00c0: 37 30 62 32 66 36 35 30 38 64 62 38 34 30 62 65  70b2f6508db840be
00d0: 39 37 34 30 35 31 33 31 66 63 65 33 30 39 30 31  97405131fce30901
00e0: 66 34 0a 55 20 64 72 68 0a 5a 20 36 33 39 66 64  f4.U drh.Z 639fd
00f0: 38 35 63 30 61 30 35 35 30 63 31 39 35 66 65 64  85c0a0550c195fed
0100: 63 62 66 30 62 35 36 33 32 38 34 0a              cbf0b563284.