From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] Document diff.external and mergetool.<tool>.path
Date: Tue, 18 Dec 2007 01:00:58 +0000 (GMT)
Message-ID: <Pine.LNX.4.64.0712180100480.9446@racer.site>
References: <E6DFE65BB5ADFE44BE13CCC976124447D5BB8D@fue-email2.ad.mc.com>
 <Pine.LNX.4.64.0712171220540.9446@racer.site> <7vtzmg5072.fsf@gitster.siamese.dyndns.org>
 <Pine.LNX.4.64.0712180047300.9446@racer.site> <7vy7bs3jv2.fsf@gitster.siamese.dyndns.org>
Mime-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: "Schuberth, Sebastian" <sschuberth@visageimaging.com>,
	git@vger.kernel.org
To: Junio C Hamano <gitster@pobox.com>
X-From: git-owner@vger.kernel.org Tue Dec 18 02:01:44 2007
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1J4Qq5-0008Sa-7P
	for gcvg-git-2@gmane.org; Tue, 18 Dec 2007 02:01:41 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751602AbXLRBBO (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Mon, 17 Dec 2007 20:01:14 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751954AbXLRBBO
	(ORCPT <rfc822;git-outgoing>); Mon, 17 Dec 2007 20:01:14 -0500
Received: from mail.gmx.net ([213.165.64.20]:46433 "HELO mail.gmx.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP
	id S1751602AbXLRBBN (ORCPT <rfc822;git@vger.kernel.org>);
	Mon, 17 Dec 2007 20:01:13 -0500
Received: (qmail invoked by alias); 18 Dec 2007 01:01:11 -0000
Received: from unknown (EHLO [138.251.11.74]) [138.251.11.74]
  by mail.gmx.net (mp021) with SMTP; 18 Dec 2007 02:01:11 +0100
X-Authenticated: #1490710
X-Provags-ID: V01U2FsdGVkX19Xz88K4rpX88wLdM0Ku7KJT0VIO1UGnM+OZcl2ox
	mheW0VNyWJId8c
X-X-Sender: gene099@racer.site
In-Reply-To: <7vy7bs3jv2.fsf@gitster.siamese.dyndns.org>
X-Y-GMX-Trusted: 0
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/68679>

Hi,

On Mon, 17 Dec 2007, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > On Mon, 17 Dec 2007, Junio C Hamano wrote:
> >
> >> Thanks.  Applied.
> >
> > Dumb question: with, or without, the diff.external patch?
> 
> Swapped the order to first make diff.external work and then document.

Thank you very much!

Ciao,
Dscho