From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 05 Mar 2015 18:55:44 GMT
Subject: Re: Git merge driver / attributes bug in 2.3.1?
Message-ID: <xmqqa8zr46kv.fsf@gitster.dls.corp.google.com>
In-Reply-To: <D8780C527EB1E642B3150E6D705B46D448E7E48C@DWPWHMS531.dwpbank.local>

"Gondek, Andreas" <Andreas.Gondek@dwpbank.de> writes:

> after upgrading the Git installation on one of our development servers
> from 1.9.0-rc3 to 2.3.1 we are experiencing strange behavior of merge
> drivers.

Do you see the same with something slightly older, like say v2.2.0?

The only change that I can think of offhand that may be related is
6ea358f7 (ll-merge.c: refactor `read_merge_config()` to use
`git_config_string()`, 2014-08-13) that went into v2.2.0, but I
don't immediately see how that would be related X-<.