Description
Two files that differ by a few lines are exhausting to compare by eye, and a screen full of <<<<<<< conflict markers is worse.
Meld lays the differences side by side and colours what was added, removed or changed. Click an arrow to merge a change from one side to the other. Folders compare the same way, so you can see which files differ and which exist on only one side.
It also hooks into version control to show working-copy changes, which makes resolving merge conflicts much easier than raw text.
File comparison: two or three files side by side with highlighted differences and block-by-block merging.
Folder comparison: compare two directories and list new, missing and differing files.
Version control view: see working-copy changes and resolve merge conflicts.
Editing and highlighting: edit while you compare, with syntax highlighting for code.
Meld lays the differences side by side and colours what was added, removed or changed. Click an arrow to merge a change from one side to the other. Folders compare the same way, so you can see which files differ and which exist on only one side.
It also hooks into version control to show working-copy changes, which makes resolving merge conflicts much easier than raw text.
Features
File comparison: two or three files side by side with highlighted differences and block-by-block merging.
Folder comparison: compare two directories and list new, missing and differing files.
Version control view: see working-copy changes and resolve merge conflicts.
Editing and highlighting: edit while you compare, with syntax highlighting for code.
