The interface is definitely dated, but I love xxdiff for showing complex diffs and merge conflicts. Superb tool.
If you'd like to know what the differences are going forward, you might want to place both versions under a version control system like git, which can make finding differences (and moving changed code) very easy. But I'd have to want to do the same task again tomorrow to go this extra step. :)