From: Dror Levy <drorlevy@live.com>
Date: Fri, 15 May 2015 14:49:51 GMT
Subject: RE: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options
Message-ID: <DUB407-EAS33488F5B18766E047421E9EAEC70@phx.gbl>
In-Reply-To: <dba4955a359a93ff8fba2addc2de0e5a@www.dscho.org>

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