On Jun 17, 2007, at 5:59 PM, Steffen Prohaska wrote:
Apple's developer tools include the application FileMerge, which supports graphical three way merges with ancestor. This patch makes the tool available through git-mergetool. FileMerge is assumed to be installed at its default location.
Hmm, now I found out that opendiff, which was already available as an option, actually launches FileMerge. I wasn't aware of this fact. git-mergetool proposed to use vimdiff although I had preferred the graphical application FileMerge, which would have been launched by opendiff. Don't know if my patch makes any sense. Probably a note in the documentation that opendiff launches the GUI would be nice. Steffen - 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
