Changes to ticket 5037536050
By anonymous on 2009-02-16 11:08:06. See also: artifact content, and ticket history
- Change comment to "It would be nice if the conflict markers in merge results looked like: <verbatim> >>>>>>>> BEGIN MERGE CONFLICT <<<<<<<< <my version> ====================================== <your version> >>>>>>>>> END MERGE CONFLICT <<<<<<<<< </verbatim> Sometimes it's not clear where one parts ends an another one starts, especially when merging branches after the development has diverged for a while."
- Change foundin to "bc857ecd92"
- Change private_contact to "6984f5ff2d3f66a87d3c6ddcf777c37b54e478f0"
- Change severity to "Minor"
- Change status to "Open"
- Change title to "Confusing conflict markers"
- Change type to "Feature_Request"