|
2010-10-29
| ||
| 11:13 | • Ticket [aa01499923] Merge tests fail on NetBSD and Mac OS/X 10.6.4 status still Open with 2 other changes ... (artifact: 00f9aab990 user: anonymous) | |
|
2010-10-14
| ||
| 19:49 | • Fixed ticket [e3a1beef67]: Conflict markers are reversed plus 1 other change ... (artifact: c7a0adcf72 user: drh) | |
| 19:48 | Reverse the direction of conflict markers. Ticket [e3a1beef67c97eb2e4d5a] ... (check-in: 93984e2d86 user: drh tags: trunk) | |
| 15:50 | • Add attachment merge-marker.diff to ticket [e3a1beef67] ... (artifact: b10a4b0d07 user: anonymous) | |
| 14:46 | • New ticket [e3a1beef67] Conflict markers are reversed. ... (artifact: 0e5131dc59 user: anonymous) | |
| Ticket Hash: | e3a1beef67c97eb2e4d5a140cb0bf1a222ec0512 | |||
| Title: | Conflict markers are reversed | |||
| Status: | Fixed | Type: | Feature_Request | |
| Severity: | Severe | Priority: | ||
| Subsystem: | Resolution: | Fixed | ||
| Last Modified: | 2010-10-14 19:49:03 | |||
| Version Found In: | c845b28714 | |||
| Description: | ||||
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. | ||||
Attachments:
- merge-marker.diff [download] added by anonymous on 2010-10-14 15:50:19. [details]