Function: majutsu-log-insert-conflicts

majutsu-log-insert-conflicts is a natively compiled function defined in majutsu-log.el.

Signature

(majutsu-log-insert-conflicts)

Documentation

Insert conflicted files section.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-log.el
;;; Log insert conflicts

(defun majutsu-log-insert-conflicts ()
  "Insert conflicted files section."
  (let ((entries (majutsu-jj-conflicted-files)))
    (when entries
      (magit-insert-section (conflict)
        (magit-insert-heading "Unresolved Conflicts")
        (dolist (entry entries)
          (let* ((file (plist-get entry :path))
                 (sides (plist-get entry :sides))
                 (heading (if sides
                              (format "%s (%d-sided conflict)" file sides)
                            file)))
            (magit-insert-section (jj-file file)
              (magit-insert-heading (propertize heading 'face 'error))
              (insert "\n"))))
        (insert "\n")))))