Merge branch 'project-next'

[gnu-emacs] / lisp / vc / vc.el

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 0a2169534e569565427b44af289e1ec92a18e424..efd816b4f0ebe9f53d2991ba7e88a783b5031351 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2068,6 +2068,13 @@ changes from the current branch."
     (smerge-mode 1)
     (message "File contains conflicts.")))
 
+;;;###autoload
+(defun vc-message-unresolved-conflicts (filename)
+  "Display a message indicating unresolved conflicts in FILENAME."
+  ;; This enables all VC backends to give a standard, recognizeable
+  ;; conflict message that indicates which file is conflicted.
+  (message "There are unresolved conflicts in %s" filename))
+
 ;;;###autoload
 (defalias 'vc-resolve-conflicts 'smerge-ediff)