Overview
Artifact ID: | fc175456b81451bc01dfbb4808af6174e3d5e8f3 |
---|---|
Ticket: | 427938e2f69393d22b884be577e2e670ec23bea4
three-way merge |
User & Date: | dmitry 2011-09-11 15:00:38 |
Changes
- Appended to comment:
<hr /><i>dmitry added on 2011-09-11 15:00:38 UTC:</i><br /> See <i>gmerge-command</i> in [http://www.fossil-scm.org/index.html/help?cmd=settings | settings].
- resolution changed to: "Fixed"
- status changed to: "Fixed"