From 3c2624e18826d9466eff13524b43903b781ada91 Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 20 May 2020 01:54:33 +0300
Subject: [PATCH] project--vc-list-files: Don't list conflicted files thrice

* lisp/progmodes/project.el (project--vc-list-files):
Use delete-consecutive-dups.
---
 lisp/progmodes/project.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 44259990bbf..06e882b9f06 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -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)
-- 
2.39.5