From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 25 Aug 2013 20:10:13 GMT
Subject: Re: Re: [PATCH 09/13] Improve section "Merge multiple trees"
Message-ID: <20130825201013.GB2752@elie.Belkin>
In-Reply-To: <2127851205.483802.1377432379441.JavaMail.ngmail@webmail16.arcor-online.net>

Thomas Ackermann wrote:

>> Maybe the intent is
>>
>> 	Git can help you perform a three-way merge, which can in turn be
[...]
> If you don't mind I will use your text

No problem.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>