From: Jay Soffian Date: Thu, 29 Oct 2009 06:17:43 GMT Subject: Re: [PATCH] mergetool--lib: add p4merge as a pre-configured mergetool option Message-ID: <76718490910282317g56d97652k3b9fa1dbbe4abdbd@mail.gmail.com> In-Reply-To: <7v1vkngkdm.fsf@alter.siamese.dyndns.org> On Wed, Oct 28, 2009 at 4:37 PM, Junio C Hamano wrote: > Thanks.  Is Jay happy with this version? It's good enough, but I'm still going to send a follow up patch that looks in /Applications and $HOME/Applications since I don't think the user should have to set the full path (they don't on other platforms). So: Acked-by: Jay Soffian j.