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 -- 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