0
votes
1answer
64 views

How can I plug FileMerge into my Source Control App

I'd like to use FileMerge (Version 2.8) as Git and Perforce's Diff viewer, however whenever one of these apps tries to do a diff I get this message: This isn't just for Groovy files either,it's for ...
1
vote
1answer
852 views

FileMerge says “unable to save file” on Mountain Lion [closed]

FileMerge/opendiff used to work fine for me when i was on Lion. After upgrading to Mountain Lion, FileMerge always says 'unable to save file'. Anyone else having the same problem? Any solutions? ...
7
votes
3answers
6k views

How to use Xcode 4 mergetool in a standalone fashion?

I sometimes have to make git merges on the console. Up to now, for resolving conflicts, I was using Xcode 3's FileMerge (you can open it on the console using the 'opendiff' command). If conflicts ...