Meld is a graphical diff viewer and merge application for the Gnome desktop. It supports 2 and 3-file diffs, recursive directory diffs, diffing of directories under version control (Bazaar, Codeville, CVS, Darcs, Fossil SCM, Git, Mercurial, Monotone, Subversion), as well as the ability to manually and automatically merge file differences.
Meld shows differences between two or three files (or two or three directories) and allows you to move content between them, or edit the files manually.
Meld’s focus is on helping developers compare and merge source files, and get a visual overview of changes in their favourite version control system.
- 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.
- Visualize global and local differences with insertions, changes and conflicts marked.
- Built-in regex text filtering to ignore uninteresting differences.
- Syntax highlighting (with optional gtksourceview).
- 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.
- Auto-merge mode and actions on change blocks help make merges easier.
- Simple file management is also available.
- 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).
- Automatically merge two files using a common ancestor.
- Mark and display the base version of all conflicting changes in the middle pane.
- Visualize and merge independent modifications of the same file.
- Lock down read-only merge bases to avoid mistakes.
- Command line interface for easy integration with existing tools, including git mergetool.
- Internationalization support.
- Visualizations make it easier to compare your files.
|New to Linux? Read our Linux for Starters series. We start right at the basics and teach you everything you need to know to get started with Linux.|
|The largest compilation of the best free and open source software in the universe. Each article is supplied with a legendary ratings chart helping you make informed decisions.|
|Hundreds of in-depth reviews offering our unbiased and expert opinion on software. We offer helpful and impartial information.|
|Alternatives to Google's Products and Services examines your options to migrate from the Google ecosystem with open source Linux alternatives.|
|Alternatives to Microsoft's Products and Services recommends open source Linux software.|
|Alternatives to Adobe Cloud looks at free and open source alternatives to products available from Adobe Cloud's subscription service.|
|Alternatives to Apple recommends free and open source alternatives to Apple's proprietary world.|
|Alternatives to Corel surveys alternatives to Corel's range of graphics processing products and other software applications.|
|Getting Started with Docker helps you master Docker, a set of platform as a service products that delivers software in packages called containers.|
|Essential Linux system tools focuses on small, indispensable utilities, useful for system administrators as well as regular users.|
|Linux utilities to maximise your productivity. Small, indispensable tools, useful for anyone running a Linux machine.|
|Home computers became commonplace in the 1980s. Emulate home computers including the Commodore 64, Amiga, Atari ST, ZX81, Amstrad CPC, and ZX Spectrum.|
|Now and Then examines how promising open source software fared over the years. It can be a bumpy ride.|
|Linux at Home looks at a range of home activities where Linux can play its part, making the most of our time at home, keeping active and engaged.|
|Linux Candy reveals the lighter side of Linux. Have some fun and escape from the daily drudgery.|
|Best Free Android Apps. We showcase free Android apps that are definitely worth downloading. There's a strict eligibility criteria for inclusion in this series.|
|These best free books accelerate your learning of every programming language. Learn a new language today!|
|These free tutorials offer the perfect tonic to our free programming books series.|
|Stars and Stripes is an occasional series looking at the impact of Linux in the USA.|