Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options

This bug happens when attempting to merge a branch which was committed without normalization, with a branch which is normalized, from a machine set with normalization enabled.

When attempting to merge to normalized branch it returns an error and requests for manual merge.

Example of the output of the issue from the command line https://gist.github.com/Jiyuu/1ed14ac32e25abb884ef

repo for replication https://github.com/Jiyuu/gitbug

To replicate run(from a system using crlf line endings) the following command from the "a" branch: git merge -v -X theirs -X renormalize b

Using git version 1.9.5.msysgit.1

Hi,

On 2015-05-15 16:14, Dror Levy wrote:

Please verify with Git for Windows 2.x (developers' preview) from https://git-for-windows.github.io/ whether the problem persists.

Ciao, Johannes

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:

Please verify with Git for Windows 2.x (developers' preview) from https://git-for-windows.github.io/ whether the problem persists.

Ciao, Johannes

Hi,

On 2015-05-15 16:49, Dror Levy wrote:

Thanks for checking, Johannes