Comparing wordpress files for differences.

[Jonas thomas]

Hi I kind of got myself between a rock and a hardplace on a wordpress website I've been working on

Basically in hindsite, I should have set up a child template, because when I update the template, the tweaks that I needed to do have been wiped out.

Anyway, I'm thinking of setting up a child template and doing it correctly.

Short of using git, is there some wonderful magical Linux command/ incantation that will recursively search two folders and sub folders and point out the differences in the files?

Thanks in advance

[Bucky Ball]

There is a program called Meld in the repos. The files need to be on the same local drive but it will compare them, show different files and merge if required.

[sandyd]

There is a program called Meld in the repos. The files need to be on the same local drive but it will compare them, show different files and merge if required.

You can also use diff, which Meld is a frontend off.

[marinara]

diff -r

[tienlbhoc]

And how to comparing text in files for differences at where?