I just grabbed the latest version of WinMerge, and am trying to compare two
directories. One of them I tared up from a server because I had modified
them there, and now I'm wanting to merge the changes back to the master,
however most of the files I changed are showing up as binary files. These
are plain php text files. I've tried to make sure they're both in DOS
format and stuff, so I don't know what the problem is. I assume there's
some random control character in there somewhere, but how should I find or
get rid of it? Any suggestions would be appreciated.
(PS - WinMerge did work for one of the files, and I loved it!)
Ryan
|