[nongnu] elpa/git-commit 1e2b473f20 3/9: magit-ediff-resolve: Rename to magit-ediff-resolve-rest

[ELPA Syncer]

branch: elpa/git-commit
commit 1e2b473f202f4c0689de4feaf52c35c069707cf0
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-ediff-resolve: Rename to magit-ediff-resolve-rest
---
 docs/magit.org      | 4 ++--
 docs/magit.texi     | 6 +++---
 lisp/magit-ediff.el | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/magit.org b/docs/magit.org
index 3c659f7f3e..8f7b9bb44e 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -3496,7 +3496,7 @@ information on how to use Ediff itself, see info:ediff.
   revisions, choose a revision to view changes along, starting at the
   common ancestor of both revisions (i.e., use a "..."  range).
 
-- Key: E m (magit-ediff-resolve) ::
+- Key: E m (magit-ediff-resolve-rest) ::
 
   Resolve outstanding conflicts in a file using Ediff, defaulting to
   the file at point.
@@ -3512,7 +3512,7 @@ information on how to use Ediff itself, see info:ediff.
 - Key: E t (magit-git-mergetool) ::
 
   This command does not actually use Ediff.  While it serves the same
-  purpose as =magit-ediff-resolve=, it uses =git mergetool --gui= to
+  purpose as =magit-ediff-resolve-rest=, it uses =git mergetool --gui= to
   resolve conflicts.
 
   With a prefix argument this acts as a transient prefix command,
diff --git a/docs/magit.texi b/docs/magit.texi
index ba584e61da..d36993b70c 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -4366,9 +4366,9 @@ line of the region.  With a prefix argument, instead of 
diffing the
 revisions, choose a revision to view changes along, starting at the
 common ancestor of both revisions (i.e., use a "@dots{}"  range).
 
-@item @kbd{E m} (@code{magit-ediff-resolve})
+@item @kbd{E m} (@code{magit-ediff-resolve-rest})
 @kindex E m
-@findex magit-ediff-resolve
+@findex magit-ediff-resolve-rest
 Resolve outstanding conflicts in a file using Ediff, defaulting to
 the file at point.
 
@@ -4384,7 +4384,7 @@ including those already resolved by Git, use
 @kindex E t
 @findex magit-git-mergetool
 This command does not actually use Ediff.  While it serves the same
-purpose as @samp{magit-ediff-resolve}, it uses @samp{git mergetool --gui} to
+purpose as @samp{magit-ediff-resolve-rest}, it uses @samp{git mergetool --gui} 
to
 resolve conflicts.
 
 With a prefix argument this acts as a transient prefix command,
diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el
index c3efdbb984..10396355b2 100644
--- a/lisp/magit-ediff.el
+++ b/lisp/magit-ediff.el
@@ -114,7 +114,7 @@ recommend you do not further complicate that by enabling 
this.")
   ["Ediff"
    [("E" "Dwim"          magit-ediff-dwim)
     ("s" "Stage"         magit-ediff-stage)
-    ("m" "Resolve"       magit-ediff-resolve)
+    ("m" "Resolve"       magit-ediff-resolve-rest)
     ("t" "Resolve using mergetool" magit-git-mergetool)]
    [("u" "Show unstaged" magit-ediff-show-unstaged)
     ("i" "Show staged"   magit-ediff-show-staged)
@@ -163,7 +163,7 @@ recommend you do not further complicate that by enabling 
this.")
           ',fn)))))
 
 ;;;###autoload
-(defun magit-ediff-resolve (file)
+(defun magit-ediff-resolve-rest (file)
   "Resolve outstanding conflicts in FILE using Ediff.
 FILE has to be relative to the top directory of the repository.
 
@@ -317,7 +317,7 @@ mind at all, then it asks the user for a command to run."
          ((and (guard (not magit-ediff-dwim-show-on-hunks))
                (or 'unstaged 'staged))
           (setq command (if (magit-anything-unmerged-p)
-                            #'magit-ediff-resolve
+                            #'magit-ediff-resolve-rest
                           #'magit-ediff-stage)))
          ('unstaged (setq command #'magit-ediff-show-unstaged))
          ('staged (setq command #'magit-ediff-show-staged))
@@ -353,7 +353,7 @@ mind at all, then it asks the user for a command to run."
                  (?c "[c]ommit"  #'magit-ediff-show-commit)
                  (?r "[r]ange"   #'magit-ediff-compare)
                  (?s "[s]tage"   #'magit-ediff-stage)
-                 (?v "resol[v]e" #'magit-ediff-resolve))))
+                 (?v "resol[v]e" #'magit-ediff-resolve-rest))))
              ((eq command #'magit-ediff-compare)
               (apply #'magit-ediff-compare revA revB
                      (magit-ediff-read-files revA revB file)))