Looking for merge tool with very good in-line-comparison support
- by peter p
I have seen this topic discussed several times, but emphasis is on "very good in-line-comparison" here, which was not really covered by those threads.
E.g. I would like the tool to recognize and highlight that the resource "colorpicker_newstring" has been added when comparing the following two blocks. WinMerge and Kdiff both fail... Does anyone know a software that does not? I am using Windows. Ah, and I'd prefer free/OS software, of course.
Thanks a lot in advance,
Peter
File A:
<resource name="colorpicker_title">Color picker</resource>
<resource name="colorpicker_apply">Apply</resource>
<resource name="colorpicker_transparent">Transparent</resource>
<resource name="colorpicker_htmlcolor">HTML color</resource>
<resource name="colorpicker_red">Red</resource>
<resource name="colorpicker_newstring">New String</resource>
<resource name="colorpicker_green">Green</resource>
<resource name="colorpicker_blue">Blue</resource>
<resource name="colorpicker_alpha">Alpha</resource>
<resource name="colorpicker_recentcolors">Recently used colors</resource>
File B:
<resource name="colorpicker_title">Sélecteur de couleur</resource>
<resource name="colorpicker_apply">Appliquer</resource>
<resource name="colorpicker_transparent">Transparent</resource>
<resource name="colorpicker_htmlcolor">Couleur HTML</resource>
<resource name="colorpicker_red">Rouge</resource>
<resource name="colorpicker_green">Vert</resource>
<resource name="colorpicker_blue">Bleu</resource>
<resource name="colorpicker_alpha">Alpha</resource>
<resource name="colorpicker_recentcolors">Couleurs récentes</resource>
