I need a app to compare&merge files

Simple task. Hard to resolve

I need an app like Araxis Merge for Windows to compare 2 files/folders and ability to merge changes (ok, compare is most wanted! i can merge by hand...)

I try versiontracker, macupdate, google/mac... just few apps and all of them didn't match (Dev tools FileMerge also...)

All of them have 1 but blocking problem... they didn't work with russian (IMO with non-english files but i didn't check... FileMerge toldme about non-ASCII file...).

And the task is:

i need to compare 2 version of .php file. its in english but with comments in russian...

Currentrly all i can - use Araxis + VirtualPC... not good

#353716

this, maybe? also, a lot of people seem to say the best way to do this is to copy the files to a pc and run windiff.

#353727

Terminal compare... errrr =)

About copy to WinPC - yep i do it (using VirtualPC). But its... anyway if I find something simpler - i make a post

Thanks.

#353730

how about "A better Finder" series? have you looked at the possibilities there? I have only used the rename and it is a serious timesaver.

#354071

"A better Finder"? what is it?

for now - all i found is kdiff3

Not so polished as FileMerge but works with unicode and "other" codepages...

#354796

Split and concat

is that what u need?

#356668

mmm... is link possible?

split and concat is very common wors to search by...

and what is "A better Finder" series"?

#359158

Split and Concat

#363209

No. Split&Concat is for split and than concat file. But I need to compare 2 versions of all a file.

#363362