From: Junio C Hamano <junkio@cox.net>
Date: Sat, 04 Feb 2006 12:22:25 GMT
Subject: Re: The merge from hell...
Message-ID: <7v1wyj1fge.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <17380.34301.584514.520465@cargo.ozlabs.ibm.com>

Paul Mackerras <paulus@samba.org> writes:

> Why is that interesting?  It seems to me that two independent changes
> were made that just happened to be within a couple of lines of each
> other, but didn't interact.

I agree th hunk in that particular case is not that interesting.

Things are not black and white but you have to draw a line
somewhere.  "Happend to be within a couple of lines" is where we
currently draw that line (it is called "context").