From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 17 Jun 2008 10:17:55 GMT
Subject: Re: Guided merge with override
Message-ID: <alpine.DEB.1.00.0806171117280.6439@racer>
In-Reply-To: <bd6139dc0806170253r5ea7844dm71d0bc407da2acc7@mail.gmail.com>

Hi,

On Tue, 17 Jun 2008, Sverre Rabbelier wrote:

> On Tue, Jun 17, 2008 at 11:48 AM, Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
>
> > Of course, I think that a better way would be to ask "git diff 
> > --name-only --diff-filter=U".
> 
> Hmmm, not having an unfinished merge at hand, would that require the
> sed on top too?

Nope.  The "--name-only" says it will print only the name.

Ciao,
Dscho