From: Junio C Hamano Date: Fri, 30 Oct 2009 18:54:47 GMT Subject: Re: [PATCH] mergetool--lib: add p4merge as a pre-configured mergetool option Message-ID: <7vmy38lnk8.fsf@alter.siamese.dyndns.org> In-Reply-To: <20091030174421.GA21486@hashpling.org> Charles Bailey writes: > On Wed, Oct 28, 2009 at 02:39:32PM -0700, Scott Chacon wrote: >> p4merge is now a built-in diff/merge tool. >> This adds p4merge to git-completion and updates >> the documentation to mention p4merge. >> >> Signed-Off-By: Scott Chacon >> --- > > Acked-by: Charles Bailey > > I'm aware that we haven't reached full agreement on the best way to > make p4merge + git as Mac OS X friendly as possible, but Jay said that > this patch is 'good enough' and I agree. If we go with this for now, > we're not closing the door to further improvements. Will queue; the peculiarity of MacOS X may be annoying, but the annoyance is not limited to the topic of adding p4merge to this codepath.