Ticket Change Details
Not logged in
Overview

Artifact ID: d5f2ae8b92f5b273aa5bf0cbf6f0be4d30fbf5f8
Ticket: 50375360502966a434b6aa1d1c915e515389288a
Confusing conflict markers
User & Date: anonymous 2009-03-11 07:24:03
Changes

  1. Appended to comment:
    
    
    <hr><i>anonymous added on 2009-03-11 07:24:03:</i><br>
    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. resolution changed to: "Open"
  3. severity changed to: "Severe"