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)

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

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)

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

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...

OS X 10.8 Mountain Lion bootable USB (without MAC)

Download the raw file from here . How to use: 1 - Copy the .raw file to an USB stick using SUSE Studio Image Writer . If you have error during copy, eject and re-connect the pen drive. When Windows asks if you want to format it, cancel and run Image Writer again. If the problem persists, disable your anti-virus software, it may be blocking raw write to the drive. Another Image Writer for Windows, if SUSE doesn't work https://launchpad.net/win32-image-writer/+download 2 - Boot the USB drive and install. If you need, type boot options , for example: -v (verbose boot) [default] -x (safe) -s (single user) GraphicsEnabler=yes (enable graphics card drivers) [default] USBBusFix=yes (fix problems with USB devices) npci=0x2000 (use if boot stops at "PCI configuration begin") cpus=1 If you need, use TransMac to remove kexts which are causing problems (System/Library/Extensions) and use the flag -f (ignore caches) at boot, or remove /System/Libra...

USB port not working on Mac

Recently I connected an external hard-disk to my new MacBook and observed that it was not properly detected on one of the USB ports. But I can see that it is powering my HDD. I tried switching to other port and it worked. I simply ignored it by thinking that my HDD cable might be loose. Now I bought a new USB drive and to get it detected, I have to insert and detach it multiple times. And as usual, I suspected the new USB drive, as my Mac is brand new. And planned to replace my USB drive. Now my HDD came back to my mind. And also my earlier laptop, in which few KEYS went unresponsive due to accumulated charges. By little researching I found that I'm not alone. The solution that worked for me was "Resetting SMC" Here is the procedure I followed: Shut down the Mac and connect the power cable Hold down Shift+Control+Option+Power concurrently for a few seconds. When the light on the power adapter blinks or changes colors you’ll know SMC r...

TechniFul

Search This Blog