On Tue, Oct 27, 2009 at 03:36:49PM -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. > --- I approve (but haven't had a chance to test this). p4merge is a good mergetool, but now I'll have to find something else as an example that you need to use custom mergetool support for. I'm just wondering, does this work well with unixes and Mac OS X? I think it's recommended install practice to symlink p4v as p4merge on *nix, but Mac OS X needs some sort of 'launchp4merge' to be called IIRC, or is this something that users can just configure with mergetool.p4diff.path? -- 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