May be something that uses reve开发者_运维百科rse-video to show the differences.
I would go for vimdiff. See this tutorial.
sdiff(1)
I use the Midnight Commander
It can compare folders and files (check the Command menu, F9
via keyboard)
When comparing files, use Enter
to navigate to the next diff, F5
to merge the selected diff from the right to the left.
Unhappily it does not support modifying the files while merging, and it also does not support merging to the right.
To install it on Linux:
sudo apt install mc
On Mac:
brew install mc
精彩评论