Artifact 0e5131dc5976219b26fa8e3c0e2c5eb2fe574b5d:

Ticket change [0e5131dc59] - New ticket [e3a1beef67] Conflict markers are reversed. by anonymous 2010-10-14 14:46:41.

---

D 2010-10-14T14:46:41
J comment <pre>\r\nFossil\smarks\sconflicts\sdifferently\sas\sanything\selse\saround\sstarting\sfrom\sdiff3.\r\nThis\sconflicts\swith\suser\sexperience,\sbreaks\susage\spatterns\sand\sit\sis\sextremely\sunhelpful\swhen\sone\suses\sready\stools.\r\nIn\sparticular\sopening\smarker\sshould\sbe\s"<<<"\srather\sthan\s">>>"\sand\svice\sversa.\r\n</pre>
J foundin c845b28714
J private_contact 77d1fb9b8673fda6e5de8f02a6ad22d96857b3e1
J severity Severe
J status Open
J title Conflict\smarkers\sare\sreversed
J type Feature_Request
K e3a1beef67c97eb2e4d5a140cb0bf1a222ec0512
U anonymous
Z 22db9bdc21de8beaed4b6cd2096b8980