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 <schacon@xxxxxxxxx> > --- Acked-by: Charles Bailey <charles@xxxxxxxxxxxxx> 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. I confirmed a (perhaps very minor) issue with the abspath approach, the parameters are used as the title of the pains in p4merge, so (IMHO) short paths look neater, especially if you've cd'ed down to a low level and don't have a 1920 pixel wide monitor. p4merge does truncate from the left so it's not a big thing. The other thing which I confirmed is that p4merge on windows doesn't like /dev/null as an explicit parameter (it gets convered to nul: by msys, I believe, but it still doesn't like it). p4merge does appear to do 'magic' when the base and left are the same parameter (not just the same file - the magic doesn't work if you, say, use a relative path and an absolute path to refer to the same file. This means that it doesn't just take the right changes which is what I feared it might do when I first saw the 'local' 'local' 'remote' pattern. Charles. -- Charles Bailey http://ccgi.hashpling.plus.com/blog/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html