Use vimdiff as default pacdiff-merge DIFFPROG

This commit is contained in:
Alexander Schäferdiek 2021-05-25 18:49:26 +02:00
parent a5c12deb87
commit b294b005bb

View file

@ -4,7 +4,7 @@ alias pkgfile-update="sudo pkgfile --update"
alias pac="yay" alias pac="yay"
alias pkg-upgrade="yay && pacman-orphans && sudo paccache -rk 2 && sync" alias pkg-upgrade="yay && pacman-orphans && sudo paccache -rk 2 && sync"
alias pkg-upgrade-full="yay -Syyu --devel && pacman-orphans && sudo paccache -rk 2 && sync" alias pkg-upgrade-full="yay -Syyu --devel && pacman-orphans && sudo paccache -rk 2 && sync"
alias pacdiff-merge='sudo DIFFPROG=meld DIFFSEARCHPATH="/boot /etc /usr" pacdiff' alias pacdiff-merge='sudo DIFFPROG=vimdiff DIFFSEARCHPATH="/boot /etc /usr" pacdiff'
alias font-cache-update='sudo fc-cache -vf' alias font-cache-update='sudo fc-cache -vf'
alias mkinitcpio-linux='sudo mkinitcpio -p linux' alias mkinitcpio-linux='sudo mkinitcpio -p linux'
@ -29,4 +29,4 @@ pacman-modified() {
pacman-disowned() { pacman-disowned() {
sudo lostfiles sudo lostfiles
} }