From: Dror Levy <drorlevy@live.com>
Date: Fri, 15 May 2015 13:56:48 GMT
Subject: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options
Message-ID: <loom.20150515T153902-500@post.gmane.org>

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