History Of Ticket 5037536050
Not logged in
HomeFilesLeavesTimelineBranchesTagsTicketsWikiLogin
Status Timeline
Ticket change [6bb653321d] (rid 4577) by drh on 2009-03-21 16:24:43:
  1. Appended to comment:

    drh added on 2009-03-21 16:24:43:
    Fixed in 83566f24241a01bedbf89d8ca068c7c1b926b4f0

  2. Change resolution to "Fixed"
  3. Change status to "Fixed"
Ticket change [d5f2ae8b92] (rid 4554) by anonymous on 2009-03-11 07:24:03:
  1. Appended to comment:

    anonymous added on 2009-03-11 07:24:03:
    This is pretty atrocious, to be honest. I cannot think of any tool that does this bad a job at handling merge conflicts, period. Even diff/patch .rej files are superior.

  2. Change resolution to "Open"
  3. Change severity to "Severe"
Ticket change [4287377fa8] (rid 4528) by anonymous on 2009-02-16 11:08:06:
  1. 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."
  2. Change foundin to "bc857ecd92"
  3. Change private_contact to "6984f5ff2d3f66a87d3c6ddcf777c37b54e478f0"
  4. Change severity to "Minor"
  5. Change status to "Open"
  6. Change title to "Confusing conflict markers"
  7. Change type to "Feature_Request"

Fossil version [c0211010a1] 2009-12-13 01:31:36