Looking for merge tool with very good in-line-comparison support

Question

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>

EDIT: Since I still have not found a good and affordable tool, I decided to add additional line breaks before and after the text nodes (as patrick suggested). This way it works fine with every simple merge/compare tools. I.e. this problem is currently solved for me - however, if someone know's a good tool for cases like this, I'd still be interested in your answers :) Thanks, everybody.

Answer 1

I use BeyondCompare. Granted it's not free, but it's not expensive. It has plugins that handle a wide variety of file formats and does what you are looking for. I used to use WinMerge but I ran into the same problem as you and wanted something better. There is a 30 day full-featured trial.

Answer 2

Try Winmerge. its a good tool.

Kdiff3 is also good for 3 way merging.

Answer 3

Araxis Merge will do what you want, but it is extremely expensive, so probably doesn't fit your brief.

Answer 4

I have been very impressed with Perforce Merge which works really well as my default GIT merge tool

http://www.perforce.com/perforce/products/merge.html

Oh and it's free