            ;; [1]: https://stackoverflow.com/q/3921409/3538165
            (format "Repository %S has a merge conflict:\n%S"
                    local-repo
-                   (string-join
-                    (mapcar (lambda (line)
-                              (concat "  " line))
-                            (split-string conflicted-files "\n"))
-                    "\n"))
+                   (straight--split-and-trim
+                    conflicted-files 2))
            ("a" "Abort merge"
             (straight--get-call "git" "merge" "--abort")))))))
 

      (straight-vc-git--popup
        (format "Repository %S has a dirty worktree:\n\n%s"
                local-repo
                (string-join
                 (mapcar (lambda (line)
                           (concat "  " line))
                         (split-string status "\n"))
                 "\n"))
        ("z" "Stash changes"
         (let ((msg (read-string "Optional stash message: ")))
           (if (string-empty-p msg)


;;;;; Strings

(defun straight--split-and-trim (string &optional indent)
  "Split the STRING on newlines, returning a list.
Remove any blank lines at the beginning or end. If INDENT is
non-nil, then add that many spaces to the beginning of each line
and concatenate them with newlines, returning a string instead of
a list."
  (let ((parts (split-string string "\n")))
    ;; Remove blank lines from beginning.
    (while (equal (car parts) "")
      (setq parts (cdr parts)))
    (setq parts (nreverse parts))
    ;; Remove blank lines from end.
    (while (equal (car parts) "")
      (setq parts (cdr parts)))
    (setq parts (nreverse parts))
    ;; Add indentation.
    (if indent
        (let ((indent (make-string (or indent 0) ? )))
          (string-join (mapcar (lambda (part)
                                 (concat indent part))
                               parts)
                       "\n"))
      parts)))

(cl-defun straight--uniquify (prefix taken)
  "Generate a string with PREFIX that is not in list TAKEN.
This is done by trying PREFIX-1, PREFIX-2, etc. if PREFIX is
