From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 May 2010 23:55:53 GMT
Subject: Re: Ensimag students working on textconv for blame
Message-ID: <7v63277f92.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTinHLoYMgBawxmXpH5XSyJDb_743HEpfCmfqoRHu@mail.gmail.com>

Diane Gasselin <diane.gasselin@ensimag.imag.fr> writes:

> Afterwards, we thought about working on git-merge.
> Actually, when having some local changes in some files
> that would be overwritten by merge, git-merge aborts giving the
> first file for which there is a problem.

That's a nice bite-sized problem to tackle.  Thanks (and thank you,
Matthieu).