Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

multiple changes in one line with diff tool?

Tags:

diff

Normally, 'diff' tool finds only changes between lines. For example, if i compare 'abcdef' and 'AbcdEf', diff will show that 'abcde' is changed and 'f' is unchanged. Is it possible to find multiple changes per line, so in example above i will see that it's only 'a' changed to 'A' and 'e' changed to 'E'? Or diff outut format does not support such?

like image 779
grigoryvp Avatar asked Aug 12 '09 12:08

grigoryvp


2 Answers

There are multiple diff tools that will do what you're asking for.

Off the top of my head I know Winmerge and TortoiseMerge does that.

like image 115
Joseph Avatar answered Nov 03 '22 00:11

Joseph


I recommend KDiff3 which highlights with different colours changes on the same line.

alt text

like image 35
hlovdal Avatar answered Nov 02 '22 22:11

hlovdal