Subject: Re: [PATCH] reset: --unmerge

From: Junio C Hamano <[email-masked]>
Date: Thu, 27 Oct 2016 09:23:04 -0700

Andreas Schwab <[email-masked]> writes:

> On Okt 25 2016, Junio C Hamano <[email-masked]> wrote:
>
>> Somebody with a bright idea decided that vc-git-resolve-conflicts
>> variable should be on by default in Emacs 25.1 X-<
>
> This is consistent with the behaviour of the other VC backends, where it
> isn't even customizable.

The problem I had was "M-x save-buffer" (after resolving the
conflicts in it manually) running "git add" on the resulting file,
robbing from "git diff" an opportunity to help the user to see how
the result looks relative to both branches.

Do you mean that VC mode broke the same feature equally other SCMs,
too?  Do other SCM supported by VC backends take advantage of
unmerged stages in the index (until you say "$scm add") by allowing
you to verify the combined diff with "$scm diff"?