Artifact a500eb526157c8844d69c5746694e821fa96dfc7:

Ticket change [a500eb5261] - Ticket [984d15b811] Merge conflict markers could be more helpful status still Open with 2 other changes by anonymous 2010-10-15 13:59:32.

---

D 2010-10-15T13:59:32
J +comment \n\n<hr\s/><i>anonymous\sclaiming\sto\sbe\sJoerg\sSonnenberger\sadded\son\s2010-10-15\s13:59:32:</i><br\s/>\nI\sagree\sthat\sthe\smarkers\sat\sthe\smoment\sare\sless\shelpful.\sWould\sit\smake\ssense\sto\smake\sthem\sreal\sprefixes?\sE.g.\r\n\r\n<verbatim>\r\n<<<<\sWorking\scopy\s(version:\sXXX)\r\n...\r\n====\sConflict\sfrom\sversion\sYYY\r\n....\r\n>>>\sEnd\sof\sconflict\sbetween\sXXX\sand\sYYY\r\n</verbatim>\r\n\r\nWould\sthat\sbreak\sany\stools\sfor\sconflict\sresolution?
J resolution Open
K 984d15b81114087e9ebd036b70161d1f14ea75fa
U anonymous
Z c01f55cb499acc6214fb3ded06bb5a79