From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Sep 2011 15:25:48 GMT
Subject: Re: Merge seems to overwrite unstaged local changes
Message-ID: <7vaa9o1yf7.fsf@alter.siamese.dyndns.org>
In-Reply-To: <j5v9r7$fi1$1@dough.gmane.org>

Sebastian Schuberth <sschuberth@gmail.com> writes:

> ... I'm seeing this on Linux and Windows, with versions 1.7.4.3 and 1.7.6.

There recently have been quite a change in merge-recursive implementation
and it would be really nice if you can try this again with the tip of
'master' before 1.7.7 final ships.

Thanks.