From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 29 Jun 2007 10:07:00 GMT
Subject: Re: [PATCH] git add: respect core.filemode even with unmerged entriesin the index
Message-ID: <Pine.LNX.4.64.0706291106190.4438@racer.site>
In-Reply-To: <4684AD41.9868C32F@eudaptics.com>

Hi,

On Fri, 29 Jun 2007, Johannes Sixt wrote:

> However, if only two stages are present, the file mode is still taken 
> from the file instead of from the index. As that easy to solve (at least 
> for the unambiguous case)?

It might be related to the bug Junio found, i.e. that I assumed stage 1 to 
be "ours".

Ciao,
Dscho