Commit 3c2624e1 authored by Dmitry Gutov's avatar Dmitry Gutov

project--vc-list-files: Don't list conflicted files thrice

* lisp/progmodes/project.el (project--vc-list-files):
Use delete-consecutive-dups.
parent 5af99187
......@@ -391,7 +391,9 @@ backend implementation of `project-external-roots'.")
submodules)))
(setq files
(apply #'nconc files sub-files)))
files))
;; 'git ls-files' returns duplicate entries for merge conflicts.
;; XXX: Better solutions welcome, but this seems cheap enough.
(delete-consecutive-dups files)))
(`Hg
(let ((default-directory (expand-file-name (file-name-as-directory dir)))
args)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment