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
Comparing files: https://stackoverflow.com/questions/30139597/visual-studio-code-is-there-a-compare-feature-like-that-plugin-for-notepad
Comparing folders: https://github.com/L13/vscode-diff
For merging you can use the command git merge
– danilo Apr 27 '20 at 15:53