Merge branch 'pacdiff-sudo-docs' into 'master'

pacdiff: clarify -s/--sudo docs to indicate use of sudoedit as well as sudo

Closes #18

See merge request pacman/pacman-contrib!16

3 files changed, 3 insertions, 3 deletions

diff --git a/completions/zsh/_pacdiff b/completions/zsh/_pacdiff
index 4f1cf2e..c936c87 100644
--- a/completions/zsh/_pacdiff
+++ b/completions/zsh/_pacdiff
@@ -12,7 +12,7 @@ args=(
 	'(-c --cachedir)'{-c,--cachedir}'[scan directory for 3-way merge base candidates]:directory:_files -/'
 	'--nocolor[remove colors from output]'
 	'(-o --output)'{-o,--output}'[print files instead of merging them]'
-	'(-s --sudo)'{-s,--sudo}'[use sudo to merge/remove files]'
+	'(-s --sudo)'{-s,--sudo}'[use sudo and sudoedit to merge/remove files]'
 	'(-)'{--help,-h}'[display help message]'
 	'(-)--version[display version]'
 )
diff --git a/doc/pacdiff.8.adoc b/doc/pacdiff.8.adoc
index da756e8..3f7affd 100644
--- a/doc/pacdiff.8.adoc
+++ b/doc/pacdiff.8.adoc
@@ -51,7 +51,7 @@ Options
 	Scan 'dir' instead as the pacman cache for 3-way merge base candidates.
 
 *-s, \--sudo*::
-	Use sudo to merge/remove files.
+	Use sudo and sudoedit to merge/remove files.
 
 See Also
 --------
diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in
index 79caefc..9ed7492 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 and sudoedit to merge/remove files
 
 Environment Variables:
   DIFFPROG          override the merge program: (default: 'vim -d')