Fossil

View Ticket
Login
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:
<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>

Attachments: