From: Junio C Hamano <junkio@cox.net>
Date: Sun, 28 Aug 2005 09:42:21 GMT
Subject: Re: [PATCH] A new merge algorithm, take 2
Message-ID: <7vslwuo0si.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20050828080341.GA1928@c165.ib.student.liu.se>

Fredrik Kuivinen <freku045@student.liu.se> writes:

> I didn't know you could do things like that with git-ls-files :) But
> yeah, it's certainly less intrusive to do it that way. It will
> probably simplify things a great deal too. Wouldn't '--unmerged' be
> the appropriate flag to use for git-ls-files in this case?

Certainly.  I was trying to see if you are paying attention ;-).