Subject: bug#25683: semi-working patch

From: Dmitry Gutov <[email-masked]>
Date: Tue, 14 Feb 2017 16:03:01 +0200

Hey Tom,

On 14.02.2017 03:12, Tom Tromey wrote:

> It was just a spot where I didn't properly update a call.
> This version works.

This is looking good (working, too). Please feel free to install.

However, if you were looking for a more fundamental solution, switching 
to parsing the output of 'git status --porcelain' should be faster and 
ultimately less complex.

See vc-git-conflicted-files for the first example of its usage, and 
https://debbugs.gnu.org/19343 for a related discussion.