Changes to ticket 5037536050

By anonymous on 2009-03-11 07:24:03. See also: artifact content, and ticket history

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"