Ah just found out about vimdiff. It pretty much does what I was looking for. here’s a quick guide
You can use
vim -d file1 file2 for that.
sdiff, a classic command line tool which shows text file differences side by side, also has an interactive merge mode. Use it by running
$ sdiff -o output.txt input1.txt input2.txt
It is the default interactive command line merge tool used by Gentoo Linux’ etc-update utility.
vimdiff are ubiquitous availability and much simpler handling.
I use the Midnight Commander for this. Select a file on the left pane and another on the right, press
F9, then Command > Compare Files.
It can also be called using the
Enter to navigate to the next diff,
F5 to merge the selected diff from the right to the left and
Shift + F5) from left to right.
It is possible to change the keybindings (useful on Mac):
mc.keymap file section
[diffviewer] change from:
MergeOther = f15
MergeOther = f6
If you want
F6 to be the default key for this, ask here
More info on