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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
