[Emacs-diffs] master 7d6a6b4: Small improvement for noninteractive gitmerge

[Glenn Morris]

branch: master
commit 7d6a6b4a4c701b7900809e6209de42f2dc14e1e3
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Small improvement for noninteractive gitmerge
    
    * admin/gitmerge.el (gitmerge-resolve-unmerged):
    In batch mode, report conflicted files.
---
 admin/gitmerge.el | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 6011d9b..e676e8f 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -448,8 +448,13 @@ Throw an user-error if we cannot resolve automatically."
            (erase-buffer)
            (insert "For the following files, conflicts could\n"
                    "not be resolved automatically:\n\n")
-           (call-process "git" nil t nil
-                         "diff" "--name-only" "--diff-filter=U")
+           (let ((conflicts
+                  (with-temp-buffer
+                    (call-process "git" nil t nil
+                                  "diff" "--name-only" "--diff-filter=U")
+                    (buffer-string))))
+             (insert conflicts)
+             (if noninteractive (message "Conflicts in:\n%s" conflicts)))
            (insert "\nResolve the conflicts manually, then run gitmerge again."
                    "\nNote:\n  - You don't have to add resolved files or "
                    "commit the merge yourself (but you can)."