|Title:||Conflict markers are reversed|
|Last Modified:||2010-10-14 19:49:03|
|Version Found In:||c845b28714|
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.
- merge-marker.diff [download] added by anonymous on 2010-10-14 15:50:19. [details]