syntax aware diff tools? [closed]

Answer 1

Beyond Compare will let you realign lines that it mismatches. I generally have good luck with it matching lines properly.