DiffMerge is a tool that compares files and shows you the differences between the two. It is similar to many tools that do the same job including BeyondCompare (this is what I use), KDiff, WinMerge, etc.
I face a similar situation as I did not originally set up my server with Git, and I've...