Pacdiff
Install
pacdiff
is no longer included in new install of Manjaro, so:
sudo pacman -S pacman-contrib
Use
sudo pacdiff
Commands
Some useful commands because I’m not used to vimdiff:
- d o - Get changes from the other window into the current window.
- d p - Put the changes from the current window into the other window.
- ] c - Jump to the next change.
- [ c - Jump to the previous change.
- z o - Open folded lines.
- z c - Close folded lines.
- Ctrl + w w - Change window.
-
:only | wq
- Quit other windows, write and quit.