The same happens with version 2.4.1.windows.1 Sent: 15 May 2015 17:35 Subject: Re: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options Hi, On 2015-05-15 16:14, Dror Levy wrote: > Using git version 1.9.5.msysgit.1 Please verify with Git for Windows 2.x (developers' preview) from https://git-for-windows.github.io/ whether the problem persists. Ciao, Johannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html