From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 11 Mar 2012 11:18:56 GMT
Subject: Re: Trouble with file specific merge strategies
Message-ID: <7vd38jxu5b.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAMXnza12HVFdmji7k-b-G43NWmobqCQEwXZXB=VxJA=tatqX-g@mail.gmail.com>

suvayu ali <fatkasuvayu+linux@gmail.com> writes:

> ... is that discussion on progit talking about
> something else?

Sorry, I do not read or write progit, so I do not know offhand what
it says in the section you read and I cannot judge if it was you who
misread, or if it was book that misspoke.