Code compare and merge tool for Mac OSX

Question

Any recommended tools, which can do in-place (for in-place, I mean some IDE or tools which could have functions of both compare and merge.) compare for two files, and merge them in-place?

I currently use the diff command line, but am looking for a GUI tool.

Free tool is appreciated. :)

Answer 1

Here are some suggestions:

• FileMerge (opendiff)

  It's no longer bundled with Xcode Command Line Tools, you must install Xcode from either the App Store or the Apple Developer Website.

• DiffMerge

• Pretty Diff

  Open sourced beautifier and language aware code comparison tool for many languages.

• Meld

  Can be installed using Homebrew via command: brew install meld

• TkDiff

  Can be installed using Homebrew via command: brew install tkdiff

• TextWrangler

• VisualDiffer

  Available at App Store

• Kaleidoscope

  Commercial with free trial.

• Araxis Merge

  Commercial with free trial.

• KDiff3

  No longer in Homebrew, it has not been developed/updated since 2014.

Related posts:

• Comparison of file comparison tools at Wikipedia
• What file comparison tool can I use under OS X? [closed]
• What's a good Mac equivalent of WinMerge? [closed]
• Portable, free, cross-platform, GUI-based prose-friendly plain-text diff and merge tool?
• Graphical diff programs for Linux

Answer 2

Take a look at this StackOverflow question. Might be what you asked for.