D 2011-09-11T15:00:38.440
J +comment \n\n
dmitry\sadded\son\s2011-09-11\s15:00:38\sUTC:
\nSee\sgmerge-command\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