Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Is there a free diff tool that allows in-line edits - like Beyond Compare?

Tags:

diff

I use KDiff3, but miss Beyond Compare's ability to modify text (or undo changes) while looking at the diff output. Is there any free windows tool that allows it?

like image 917
Joe Avatar asked Jan 06 '13 00:01

Joe


People also ask

Is P4Merge still free?

Perforce, the company best known for its enterprise version control platform, also offers a solid diff tool: P4Merge is free of charge and comes with a basic feature set that makes it an interesting option on Windows, macOS and Linux.

Is Beyond Compare a freeware?

Beyond Compare offers a 30-day free trial for new users, after which the software is available across 7 pricing tiers, details of which are outlined below - 1-4 Users - $30/user (Standard Edition) or $60/user (Pro Edition) 5-9 Users - $22.50/user (Standard Edition) or $45/user (Pro Edition) 10 - 49 Users - $19.50/user ...

Is Beyond Compare safe?

We scan every release of Beyond Compare using the scanning service at www.virustotal.com. It scans with 70 anti-virus products to make sure Beyond Compare is safe before we make it available for download.


2 Answers

Meld is easily the best (free) merge tool I've used.

like image 109
Jeffrey Theobald Avatar answered Oct 02 '22 21:10

Jeffrey Theobald


I was quite happy with SourceGear DiffMerge before I switched to BeyondCompare. The main thing BC had that made me switch was the current-line diff at the bottom of the screen (which is great for long lines).

like image 37
Rob H Avatar answered Oct 02 '22 20:10

Rob H