Accepting the possibility of extreme ridicule, I must admit that I really miss sun Teamware's filemerge tool. I have switched from solaris to red hat linux, and find myself regularly missing filemerge (not to be confused with the Apple tool of the same name), as well as the solaris version of pstack (which worked on core files just as we...
I have set my FileMerge not to ignore any file. However, it ignores my dotFiles. How can you make FileMerge to diff dotFiles? ...
How do I get the TeamWare filemerge GUI to run on OpenSolaris? % filemerge ld.so.1: filemerge: fatal: libtt.so.2: open failed: No such file or directory Killed TeamWare is no longer a supported source management system, but it's is still widely used in the OpenSolaris project, and within Sun Microsystems. ...
How do I configure Apple's FileMerge program to function as Mercurial's merge tool? I have my .hgrc file setup in my home directory and I simply want to configure FileMerge as the merge program. ...
Hi I have a .diff file but I don't know how to open it. I trie using FileMerge but that doesn't give me an option to open a .diff file. Any ideas? Thanks. ...
I've used iPhone SDK and tools for several months. XCode seems pretty nice, but there is one tool which I don't get: FileMerge. How can anyone use it for comparing files or doing merge? Seriously now, what do you really use? My use case is subversion database on remote server, few local developers working on same project as well as few...
I'm new to git, on OSX, using it via command line. I come from the world of Tortoise SVN and Beyond Compare on Windows. I want to be able to pipe in diffs to happen via FileMerge which I have installed already. I was able to do this with TextMate simply by using: git diff | mate But I'm not sure how to get that set up so I can use ...
FileMerge.app fails with an odd message: This file type cannot be merged. when I try to save successfully merged text files, which definitely can be merged. (I invoke FileMerge from git using opendiff tool on OS X 10.6.3, but problem happens even when I select files to merge manually) Why is it happening? How can I avoid this pr...
I am trying to merge two .nib files. FileMerge has no problem showing the comparison of the two files. I am trying to keep all the settings in one file (i.e. right side) except for two settings that I want to copy from the other file (i.e. left side). The differences are just one line of code each that changes the integer value of a a...
I see the option for specifying three files (left, right, and ancestor), but it doesn't seem to be possible to actually display the ancestor. The bottom pane shows the result of the merge. I'd rather see what the original content was, so I could understand the context for the left and right sides of the conflict. Is this possible? Fil...
i'm a git / osx / unix newbie but in my current job, i'm using them all. i run "git difftool" a lot to compare changes in a commit, but any time it runs into an image, i get an error from FileMerge and i have to make a few unnecessary clicks to skip it....sometimes 10 or 20 times for any commit. i looked but haven't seen any easy way t...