From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options Date: Fri, 15 May 2015 16:35:15 +0200 Organization: gmx Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org To: Dror Levy X-From: git-owner@vger.kernel.org Fri May 15 16:35:28 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YtGhx-00016W-0T for gcvg-git-2@plane.gmane.org; Fri, 15 May 2015 16:35:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932188AbbEOOfU (ORCPT ); Fri, 15 May 2015 10:35:20 -0400 Received: from mout.gmx.net ([212.227.17.20]:52139 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753971AbbEOOfT (ORCPT ); Fri, 15 May 2015 10:35:19 -0400 Received: from www.dscho.org ([87.106.4.80]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0MKLeM-1YrcHL06Sc-001lGq; Fri, 15 May 2015 16:35:17 +0200 In-Reply-To: X-Sender: johannes.schindelin@gmx.de User-Agent: Roundcube Webmail/1.1.0 X-Provags-ID: V03:K0:mp3WGTQyYqXGW2MSYiuo9G7H/S8kS3BOt5a1gkoz3qWK43bBuN6 OtE2EDk3Jm1lyWLU3eOpiGciV67d/FZMEPyogKVi+tj5RbznZpBt8PMbVYN03kwq5UHH2TU yYY/xM9InlzJVI3qydqekGVd06LaC0G+Qp91vpdi2MNNi2JRCMDBBAq3FYLv+3K3DkPyl5O pw7lGBki+Ie4F6vcjjCEQ== X-UI-Out-Filterresults: notjunk:1; Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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