Use vimdiff as my mergetool for the love of...
Resize by five lines at a time to save my sanity.