From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 02 Dec 2009 17:04:58 GMT
Subject: Re: What is the status of merging with whitespace conflicts?
Message-ID: <7vy6lli9xh.fsf@alter.siamese.dyndns.org>
In-Reply-To: <46a038f90912020234g3094cccbxd8ca80c7c0b32ca4@mail.gmail.com>

I am not working on it, and I didn't hear from anybody who is.  If you
limit the whitespace-only changes to the ones that do not cross line
boundary, it wouldn't be too hard to add.  Probably it would take less
than one summer for a good student.