pacdiff: Improve documentation accuracy and conciseness
pacdiff is a script which looks for pacorig, pacnew and pacsave files from the backup entries found in the local pacman db. For every found file the option is given to view, merge, skip, diff, remove or overwrite the found pacorig, pacnew or pacsave file.
pacdiff is a script which looks for pacnew, pacsave and pacorig files.
By default it uses pacman to search the backup entries of currently installed packages, with an option to instead use cached locate database or running find.
For each result, the user is prompted to (v)iew the differences, (s)kip, do a 3-way (m)erge using a cached package, (r)emove, or to (o)verwrite the pre-existing file.
Search Options
-f, --find
Scan using find.
-l, --locate
Scan using locate.
-p, --pacmandb
Scan active config files from pacman database. (default)
Search Options
-f, --find
Scan via find, inside of DIFFSEARCHPATH.
-l, --locate
Scan via locate, using its existing database.
-p, --pacmandb
Scan via pacman, using the backup entries of currently installed packages from its database. (default)
This seems to be the default already? At least running pacdiff
and pressing M complains about failure to find the base package.
-3, --threeway
View diffs in 3-way fashion if the base package is available in the cache. Fall back to regular 2-way diff otherwise.
-3, --threeway
View diffs in 3-way fashion using MERGEPROG if the base package is available in the cache. Fall back to regular 2-way diff using DIFFPROG otherwise.
Edited by Martin Rys