Search Results

Search found 7 results on 1 pages for 'filemerge'.

Page 1/1 | 1 

• FileMerge: This file type cannot be merged.

  - by porneL

  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) Why is it happening? How can I avoid this problem?

  Read the article

• How do I pipe in FileMerge as a diff tool with git on OSX?

  - by doug

  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 instead?

  Read the article

• Best Diff Tool?

  - by ila

  For all my present Diff / Merge needs I'm using Beyond Compare; when I decided to buy a license for it I tried other similar tools, both payware and freeware. Now BC is at version 3, and I think it's a great tool... but what are your experience in this field? Do you think there is something better? And what are the feature you like best on your favorite Diff tool? EDIT I'm recollecting here a list of the tools mentioned in the answers below, in order of preferences (more or less), separating pay- from free- ware and indicating supported operating system. Hope this helps. PAYWARE Beyond Compare (win + linux) - http://www.scootersoftware.com/ Araxis Merge (win + osX) - http://www.araxis.com/merge/index.html ExamDiff Pro (win) - http://www.prestosoft.com/edp_examdiffpro.asp ECMerge (win, osX, linux) - http://www.elliecomputing.com/Home/default.asp MergePlant (win) - http://www.mikado-ltd.com/ Changes (OSX) http://www.changesapp.com Deltopia DeltaWalker (win, osx, linux) http://www.deltopia.com/ FREEWARE FileMerge (OSX) - http://en.wikipedia.org/wiki/Apple_Developer_Tools#FileMerge Tortoise SVN (win) - http://tortoisesvn.net/ WinMerge (win) - http://winmerge.org/ ExamDiff (win) - http://www.prestosoft.com/ps.asp?page=edp_examdiff Diff Merge from SourceGear - http://www.sourcegear.com/diffmerge/index.html Perforce Merge (win + linux + OSX) - http://www.perforce.com/perforce/products/merge.html meld (linux) - sudo apt-get install meld http://meld.sourceforge.net/ Vimdiff - vim distribution KDiff3 - http://kdiff3.sf.net/ ediff - EMacs distribution Tiny Hexer Kompare (KDE, linux) - http://www.caffeinated.me.uk/kompare/ tkdiff (win, linux, osX) - http://tkdiff.sourceforge.net

  Read the article

• XCode and developer tools

  - by Infinity

  Hello guys! I want to use the FileMerge utility on my mac, but it isn't installed. I searched in the google and there is written that it will be installed with the developer tools. So the big question is where can I find the developer tools, because I downloaded the iPhone SDK 3.2 beta 5, and installed it, but I can't found the download location of developer tools. Maybe can you help me?

  Read the article

• How to convert a plist file from mac os project to iphone project?

  - by Tom Pace

  I am developing an app for the iPhone OS devices, and am using a third-party engine which is not well documented but I've made great progress with it anyway. The problem: The engine's developer strongly urges extending from the existing template projects bundled with the engine, but the engine's plist files are Mac OSX project plist files. This is an iPhone engine, and so I cannot understand why the plist file is structured to take keys for Mac OS apps, but that's how it is. I did a FileMerge comparison to ensure there was nothing within the file itself that defined its use for one OS or the other, so I guess it's defined somewhere in the project settings.

  Read the article

• Mac-native text editor that can syntax-highlight diff files?

  - by strawtarget

  I do something like "svn diff /mystuff/current.diff". I want to view this .diff file with syntax highlighting. jEdit does it, but it's a huge beast and it takes a while to start up. I want something lightweight/native. Smultron/Fraise, TextWrangler, TextEdit, Dashcode don't seem to highlight .diff files. FileMerge seems to want to generate diff files, not show you existing ones. TextMate does the trick, but it's not free. I'd feel happier dropping $50 US if I was going to take advantage of it for anything more than a diff viewer. Are there any alternatives to jEdit or TextMate that I should consider?

  Read the article

• How to convert an Info.plist file from mac os project to iphone project?

  - by Tom Pace

  I am developing an app for the iPhone OS devices, and am using a third-party engine which is not well documented but I've made great progress with it anyway. The problem: The engine's developer strongly urges extending from the existing template projects bundled with the engine, but the engine's Info.plist files are Mac OSX project Info.plist files. This is an iPhone engine, and so I cannot understand why the Info.plist file is structured to take keys for Mac OS apps, but that's how it is. I did a FileMerge comparison to ensure there was nothing within the file itself that defined its use for one OS or the other, so I guess it's defined somewhere in the project settings. Edit - Opening the plist file in Xcode or Property List Editor and then trying to add a key such as "Icon already includes gloss and bevel effects" will not work in this iPhone project because it is not in the list. However, "Cocoa Java Application" and others are available!

  Read the article

1