DIFFPROG=meld pacdiff -s
Use the prompts.
‘v’ for viewing and editing.
In this case maybe merge the comments at the top, but leave your set configuration.
Save when done.
Now you are presented with the 2 again.
‘r’ will delete the pacnew.
(use ‘s’ to skip ones you are confused about or want to revisit later, etc)
And its on to the next one.
Also see any of the hundreds of other posts…