master updated (1e240a0 -> 1a2445c)

[Dmitry Gutov]

dgutov pushed a change to branch master.

      from  1e240a0   Fix face merging for display strings broken by a recent 
commit
       new  77fe255   vc-git-after-dir-status-stage: Avoid erroneous up-to-date 
status
       new  1a2445c   Make ls-files-unknown only return proper files, not 
directories


Summary of changes:
 lisp/vc/vc-git.el | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)