[nongnu] elpa/git-commit 72ee06c7ea 5/7: magit-read-unmerged-file: New function

[ELPA Syncer]

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

    magit-read-unmerged-file: New function
---
 lisp/magit-ediff.el | 8 +-------
 lisp/magit-files.el | 9 +++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el
index 97b49cc8e1..2cafef9535 100644
--- a/lisp/magit-ediff.el
+++ b/lisp/magit-ediff.el
@@ -134,13 +134,7 @@ FILE has to be relative to the top directory of the 
repository.
 In the rare event that you want to manually resolve all
 conflicts, including those already resolved by Git, use
 `ediff-merge-revisions-with-ancestor'."
-  (interactive
-   (let ((current  (magit-current-file))
-         (unmerged (magit-unmerged-files)))
-     (unless unmerged
-       (user-error "There are no unresolved conflicts"))
-     (list (magit-completing-read "Resolve file" unmerged nil t nil nil
-                                  (car (member current unmerged))))))
+  (interactive (list (magit-read-unmerged-file)))
   (magit-with-toplevel
     (with-current-buffer (find-file-noselect file)
       (smerge-ediff)
diff --git a/lisp/magit-files.el b/lisp/magit-files.el
index 2b91c8ef2e..991ad61b20 100644
--- a/lisp/magit-files.el
+++ b/lisp/magit-files.el
@@ -501,6 +501,15 @@ Git, then fallback to using `delete-file'."
 (defun magit-read-tracked-file (prompt)
   (magit-read-file prompt t))
 
+(defun magit-read-unmerged-file (&optional prompt)
+  (let ((current  (magit-current-file))
+        (unmerged (magit-unmerged-files)))
+    (unless unmerged
+      (user-error "There are no unresolved conflicts"))
+    (magit-completing-read (or prompt "Resolve file")
+                           unmerged nil t nil nil
+                           (car (member current unmerged)))))
+
 (defun magit-read-file-choice (prompt files &optional error default)
   "Read file from FILES.