D 2009-03-11T07:24:03
J +comment \n\n<hr><i>anonymous\sadded\son\s2009-03-11\s07:24:03:</i><br>\nThis\sis\spretty\satrocious,\sto\sbe\shonest.\s\sI\scannot\sthink\sof\sany\stool\sthat\sdoes\sthis\sbad\sa\sjob\sat\shandling\smerge\sconflicts,\speriod.\s\sEven\sdiff/patch\s.rej\sfiles\sare\ssuperior.
J resolution Open
J severity Severe
K 50375360502966a434b6aa1d1c915e515389288a
U anonymous
Z 1616ec2b3ea1d5ceca7c14013ddce2f0