From: Dror Levy Date: Fri, 15 May 2015 14:14:01 GMT Subject: Re: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options Message-ID: In-Reply-To: Using git version 1.9.5.msysgit.1