From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: RE: Bug when merging non normalized branch with normalized branch
 using the -X theirs -X renormalize options
Date: Fri, 15 May 2015 20:24:57 +0200
Organization: gmx
Message-ID: <9a75157bdced6251fdae7e08c4e6e56b@www.dscho.org>
References: <loom.20150515T153902-500@post.gmane.org>
 <loom.20150515T160501-69@post.gmane.org>
 <dba4955a359a93ff8fba2addc2de0e5a@www.dscho.org>
 <DUB407-EAS33488F5B18766E047421E9EAEC70@phx.gbl>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: git@vger.kernel.org
To: Dror Levy <DrorLevy@live.com>
X-From: git-owner@vger.kernel.org Fri May 15 20:25:06 2015
Return-path: <git-owner@vger.kernel.org>
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 <git-owner@vger.kernel.org>)
	id 1YtKID-0005wb-F3
	for gcvg-git-2@plane.gmane.org; Fri, 15 May 2015 20:25:05 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754648AbbEOSZA (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Fri, 15 May 2015 14:25:00 -0400
Received: from mout.gmx.net ([212.227.17.21]:63666 "EHLO mout.gmx.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754290AbbEOSZA (ORCPT <rfc822;git@vger.kernel.org>);
	Fri, 15 May 2015 14:25:00 -0400
Received: from www.dscho.org ([87.106.4.80]) by mail.gmx.com (mrgmx101) with
 ESMTPSA (Nemesis) id 0MLB89-1YtbGy3vkH-000O92; Fri, 15 May 2015 20:24:57
 +0200
In-Reply-To: <DUB407-EAS33488F5B18766E047421E9EAEC70@phx.gbl>
X-Sender: johannes.schindelin@gmx.de
User-Agent: Roundcube Webmail/1.1.0
X-Provags-ID: V03:K0:6JJ0UMcJuhgJ4beW4ZR75hpSjITkl0yBjqvQaesYE/XjNNdmfUM
 HglvoR0Uxn6A8dK6c2e6Lm5MYSElPww6/yhT93p3Jun0a2ye8AyWPuTI2t3cqhlnVeOCMZE
 L2PWNnDd4pl59CDZCsFu36J0+Fy3TzcG8REV+jh9UfAGeGtt9I8w9PS2EPzbvqzPLLzwDuJ
 FJSFj+qD2FvX2JuHOk86Q==
X-UI-Out-Filterresults: notjunk:1;
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/269165>

Hi,

On 2015-05-15 16:49, Dror Levy wrote:
> The same happens with version 2.4.1.windows.1

Thanks for checking,
Johannes