Artifact fc175456b81451bc01dfbb4808af6174e3d5e8f3:

Ticket change [fc175456b8] - Fixed ticket [427938e2f6]: three-way merge plus 2 other changes by dmitry 2011-09-11 15:00:38.

---

D 2011-09-11T15:00:38.440
J +comment \n\n<hr\s/><i>dmitry\sadded\son\s2011-09-11\s15:00:38\sUTC:</i><br\s/>\nSee\s<i>gmerge-command</i>\sin\s[http://www.fossil-scm.org/index.html/help?cmd=settings\s|\ssettings].
J resolution Fixed
J status Fixed
K 427938e2f69393d22b884be577e2e670ec23bea4
U dmitry
Z 3af47dd83ff6e4aa34ccf756e9cdcc7b