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

[Dmitry Gutov]

On 6/28/18 4:12 PM, Eli Zaretskii wrote:

> 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.

And what does the "conflict" status mean to you?

From the vc-state docstring:

  `conflict'       The file contains conflicts as the result of a merge.
                   For now the conflicts are text conflicts.  In the
                   future this might be extended to deal with metadata
                   conflicts too.