Re: vc-dir operation is very slow on large git repositories in Emacs 26.1

[Eli Zaretskii]

> Cc: address@hidden, address@hidden, address@hidden,
>  address@hidden
> From: Dmitry Gutov <address@hidden>
> Date: Thu, 28 Jun 2018 16:06:27 +0300
> 
> -u limits the output to unmerged files only.
> 
> So the question here is whether "unmerged" covers all files we want to 
> assign the "conflict" status to. I think it does.

Yes, and I still don't think I understand what "unmerged" means in
this context.  Can you explain?  To me, "merging" only has meaning
when more than one branch is considered, or two instances of a single
branch that diverged.