TIL: mergetool+difftool; also added a cherry-pick alias