On Thu, Oct 29, 2009 at 9:02 PM, Markus Heidelberg <markus.heidelberg@xxxxxx> wrote: > He didn't mean p4merge on other platforms, but other merge tools on Mac > OS X. What about all the other merge tools already in mergetool--lib? > Should they get special handling, too? If someone wants to scratch that itch, then yes. The default diff tool for OS X has its helper already in /usr/bin (opendiff). p4merge is arguably a better merge tool, and it installs as an app bundle in /Applications. I'm not sure about the other diff tools, I haven't looked. > And for Windows we could add C:\Program Files\MergeToolX\tool.exe for > every merge tool. If it makes those tools easier to use with git, and if someone on Windows wants to scratch that itch, then yes, we should. > But where will we end? I don't understand this argument. It's a few lines of code to make git a little friendlier. We end when folks stop contributing patches because either no one cares of there's nothing left to improve. j. -- 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