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