Overview
| Artifact ID: | 0e5131dc5976219b26fa8e3c0e2c5eb2fe574b5d |
|---|---|
| Ticket: | e3a1beef67c97eb2e4d5a140cb0bf1a222ec0512
Conflict markers are reversed |
| User & Date: | anonymous 2010-10-14 14:46:41 |
Changes
- comment changed to:
<pre> Fossil marks conflicts differently as anything else around starting from diff3. This conflicts with user experience, breaks usage patterns and it is extremely unhelpful when one uses ready tools. In particular opening marker should be "<<<" rather than ">>>" and vice versa. </pre>
- foundin changed to: "c845b28714"
- private_contact changed to: "77d1fb9b8673fda6e5de8f02a6ad22d96857b3e1"
- severity changed to: "Severe"
- status changed to: "Open"
- title changed to: "Conflict markers are reversed"
- type changed to: "Feature_Request"