From b294b005bb3b044cd49ebdf161b31b8b3a26eb18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Sch=C3=A4ferdiek?= Date: Tue, 25 May 2021 18:49:26 +0200 Subject: [PATCH] Use vimdiff as default pacdiff-merge DIFFPROG --- etc/skel/.zsh_archlinux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/skel/.zsh_archlinux b/etc/skel/.zsh_archlinux index e8fd3c9..f6dc59f 100644 --- a/etc/skel/.zsh_archlinux +++ b/etc/skel/.zsh_archlinux @@ -4,7 +4,7 @@ alias pkgfile-update="sudo pkgfile --update" alias pac="yay" 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 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 mkinitcpio-linux='sudo mkinitcpio -p linux' @@ -29,4 +29,4 @@ pacman-modified() { pacman-disowned() { sudo lostfiles -} \ No newline at end of file +}