Overview
| Artifact ID: | 4287377fa8e70fc2bd3b213c64c7051ba0858d62 |
|---|---|
| Ticket: | 50375360502966a434b6aa1d1c915e515389288a
Confusing conflict markers |
| User & Date: | anonymous 2009-02-16 11:08:06 |
Changes
- comment changed 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.
- foundin changed to: "bc857ecd92"
- private_contact changed to: "6984f5ff2d3f66a87d3c6ddcf777c37b54e478f0"
- severity changed to: "Minor"
- status changed to: "Open"
- title changed to: "Confusing conflict markers"
- type changed to: "Feature_Request"