Skip to main content

Meld: Comparison Tool

Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and has support for many popular version control systems.

Meld helps you review code changes and understand patches. It might even help you to figure out what is going on in that merge you keep avoiding.

Features

  • Two- and three-way comparison between files and directories

  • Comparisons update as you type

  • Visualisations make it easier to compare your files

  • Actions on diff chunks make for easier merges

  • Supports Git, Bazaar, Mercurial, Subversion, etc.

File comparison

  • Edit files in-place, and your comparison updates on-the-fly

  • Perform two- and three-way diffs and merges

  • Easily navigate between differences and conflicts

  • Visualise global and local differences with insertions, changes and conflicts marked

  • Use the built-in regex text filtering to ignore uninteresting differences

  • Syntax highlighting (with optional gtksourceview)
Meld: Comparison Tool

Directory comparison

  • Compare two or three directories file-by-file, showing new, missing, and altered files

  • Directly open file comparisons of any conflicting or differing files

  • Filter out files or directories to avoid seeing spurious differences

  • Simple file management is also available
Meld: Comparison Tool

Version control

  • Meld supports many version control systems, including Git, Mercurial, Bazaar and SVN

  • Launch file comparisons to check what changes were made, before you commit

  • View file versioning statuses

  • Simple version control actions are also available (i.e., commit/update/add/remove/delete files)
Meld: Comparison Tool

Getting it

Meld is packaged for just about every Linux and Unix distribution, including Fedora, Ubuntu, and Suse. You should get Meld from your distribution's installer unless you want the absolute latest version. Also available on Ubuntu Software Center.

Meld does work on OS X and Windows, but there are no all-in-one packages for those systems available at the moment. On OS X, Meld is available from MacPorts or Fink. There are some notes available on how to get Meld running on Windows.

Note: This information is from the official website of MELD

Comments

Popular posts from this blog

Reverse Engineering : Extract contents from .img file

Unyaffs is a program to extract files from a YAFFS2 file system image. Currently it can only extract images created by mkyaffs2image. Download the source from here . Compiling : Extract the contents into a suitable place and run the following command make Usage : unyaffs [options] <image_file_name> [<extract_directory>] Options: -d detection of flash layout, no extraction -b spare contains bad block information -c <chunk size> set chunk size in KByte (default: autodetect, max: 16) -s <spare size> set spare size in Byte (default: autodetect, max: 512) -t list image contents -v verbose output -V print version Source: Official github repository

Mac Yosemite : Ugly turned out to be Uglier and Ugliest

You might have read my review on Mac OSX Yosemite , The Good, bad and ugly. Now it turned out to be UGLIEST. No more words. Here's the image. If you are on Yosemite, you might be familiar with it. Most of the times, you get stuck on boot logo. I've seen complaints regarding it saying that fellow members are ignorant of it and they deny such possibility, even though many are still facing it. Workarounds suggested by our online friends: Just reboot your mac as many times it takes to your desktop. Boot into safe mode, by holding SHIFT and then reboot. Comment your workaround below, mine is the first one. If you are still on Mavericks, be there till Apple provides a fix for this.

Karabiner: Mouse/keyboard customizer for OS X

For beginners, or the one who migrated from Windows environment, Natural Gestures (Scrolling and Swiping) might be bit confusing. But, once you get familiarized with them, it may feel like "What was I doing, all those days?". It all changed, when I connected external mouse to my Macbook. When you start using that WHEEL, you will be confused. Luckily there is a setting for mouse, to change scroll behavior (natural or the other way). But, here's the catch. If you toggle that setting, it also toggles the same for TRACKPAD!!!!! I've seen that many people were freaked out and even raised BUG report to Apple. But, all those reports were closed, saying that is not a bug, but intentional feature!!! For those, who can't leave with such one-sided settings, here is a simple util, which came to my rescue: Karabiner It's simple, powerful and stable mouse/keyboard customizer for OSX. Without going into much detail, here's the configuration I used to ret...