[3/4] pacdiff: update --sudo usages

Message ID 636e0fb2a256bc0fd97953aa39b7e3c06238965a.1617008556.git.liu.denton@gmail.com
State New
Headers show
Series Fixes for (M)erge mode and --sudo | expand

Commit Message

Denton Liu March 29, 2021, 9:02 a.m. UTC
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@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')