[PATCH 3/4] pacdiff: update --sudo usages
Denton Liu
liu.denton at gmail.com
Mon Mar 29 09:02:42 UTC 2021
In 19ab4fa (pacdiff: Add option to use sudo/sudoedit to manage files,
2021-03-27), the --sudo option was introduced. However, a corresponding
entry was not included in the man page. Document it.
Also, align the usage text in the program with its friends above.
Signed-off-by: Denton Liu <liu.denton at gmail.com>
---
doc/pacdiff.8.txt | 3 +++
src/pacdiff.sh.in | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/doc/pacdiff.8.txt b/doc/pacdiff.8.txt
index 592da72..12f786b 100644
--- a/doc/pacdiff.8.txt
+++ b/doc/pacdiff.8.txt
@@ -53,6 +53,9 @@ Options
*-c, \--cachedir <dir>*::
Scan 'dir' instead as the pacman cache for 3-way merge base candidates.
+*-s, \--sudo*::
+ Use sudo to merge/remove files.
+
See Also
--------
linkman:pacman[8], linkman:pacman.conf[5]
diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in
index 674892b..fe66a6e 100644
--- a/src/pacdiff.sh.in
+++ b/src/pacdiff.sh.in
@@ -60,7 +60,7 @@ General Options:
--nocolor remove colors from output
-c/--cachedir <dir> scan "dir" for 3-way merge base candidates.
(default: read from @sysconfdir@/pacman.conf)
- -s/--sudo use sudo to merge/remove files
+ -s/--sudo use sudo to merge/remove files
Environment Variables:
DIFFPROG override the merge program: (default: 'vim -d')
--
2.31.0.208.g409f899ff0
More information about the pacman-contrib
mailing list