From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 27 Oct 2016 16:05:03 GMT
Subject: Re: [PATCH] reset: --unmerge
Message-ID: <87d1il3hhs.fsf@linux-m68k.org>
In-Reply-To: <xmqqmvhsc8kn.fsf@gitster.mtv.corp.google.com>

On Okt 25 2016, Junio C Hamano <gitster@pobox.com> 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.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."