I use a modified version of this script that opens files in meld with original file on left and .pacnew file on the right
meld