I need to compare/diff/merge files in an easy way. In Dark ages when i'm a windows user I would use WinMerge. What alternatives for this are available in Ubuntu?
The things I must be able to do:
- See 2 files line by line next to each other, with the differences highlighted
- Have an option for merging this files together
Best Answer
I don't know if paid software can be recommended, but after testing a lot of free tools, I finally decided to go for Beyond Compare.
Meld was my previous choice but abandonned it due to instabilities during merging of very large folders.