Being able to open the diff in vimdiff view (or your editor's equivalent) would be a neat approach. Not entirely sure how to actually implement that.