As I understand it, you can configure git's difftool to be something more clever than line based