From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Fri, 06 Mar 2015 14:12:16 GMT
Subject: Re: Git merge driver / attributes bug in 2.3.1?
Message-ID: <54F9B5C0.9050604@drmicha.warpmail.net>
In-Reply-To: <D8780C527EB1E642B3150E6D705B46D448E8058B@DWPWHMS531.dwpbank.local>

Gondek, Andreas venit, vidit, dixit 06.03.2015 14:31:
> The archive contains my test repository, the merge driver and the .gitconfig of the user. We don't have a global .gitconfig.

Thanks for the test repo!

Alas, the merge driver gets executed with v1.9.0-rc3, v1.8.5 and v1.7.0,
at least over here - as it should be because of the conflict: two
patches changing the same file. That conflict can be resolved
automatically by the internal driver, of course. Maybe something else
changed during the upgrade?

Michael