Artifact 0c9a0638025a5fd179b8af6d70e5ca23c3a206cd:

Ticket change [0c9a063802] - Fixed ticket [769b4ed7b2]: Show number of conflicts at the end of "fossil update" plus 1 other change by drh 2011-01-18 18:36:16.

---

0000: 44 20 32 30 31 31 2d 30 31 2d 31 38 54 31 38 3a  D 2011-01-18T18:
0010: 33 36 3a 31 36 2e 35 31 38 0a 4a 20 72 65 73 6f  36:16.518.J reso
0020: 6c 75 74 69 6f 6e 20 46 69 78 65 64 0a 4a 20 73  lution Fixed.J s
0030: 74 61 74 75 73 20 46 69 78 65 64 0a 4b 20 37 36  tatus Fixed.K 76
0040: 39 62 34 65 64 37 62 32 33 65 34 63 62 37 32 66  9b4ed7b23e4cb72f
0050: 38 39 35 38 62 33 61 33 34 62 64 63 31 32 66 38  8958b3a34bdc12f8
0060: 64 64 32 31 35 35 0a 55 20 64 72 68 0a 5a 20 63  dd2155.U drh.Z c
0070: 31 32 36 62 33 61 31 62 61 39 38 63 37 32 66 36  126b3a1ba98c72f6
0080: 63 34 37 63 35 31 34 33 66 34 34 66 31 66 66 0a  c47c5143f44f1ff.