D 2009-02-16T11:08:06
J comment It\swould\sbe\snice\sif\sthe\sconflict\smarkers\sin\smerge\sresults\slooked\slike:\r\n\r\n<verbatim>\r\n>>>>>>>>\sBEGIN\sMERGE\sCONFLICT\s<<<<<<<<\r\n<my\sversion>\r\n======================================\r\n<your\sversion>\r\n>>>>>>>>>\sEND\sMERGE\sCONFLICT\s<<<<<<<<<\r\n</verbatim>\r\n\r\nSometimes\sit's\snot\sclear\swhere\sone\sparts\sends\san\sanother\sone\sstarts,\sespecially\swhen\smerging\sbranches\safter\sthe\sdevelopment\shas\sdiverged\sfor\sa\swhile.
J foundin bc857ecd92
J private_contact 6984f5ff2d3f66a87d3c6ddcf777c37b54e478f0
J severity Minor
J status Open
J title Confusing\sconflict\smarkers
J type Feature_Request
K 50375360502966a434b6aa1d1c915e515389288a
U anonymous
Z 0e54def4a57294500e454dc629a9cd4c