Diff window accept line and better alignment.

1-Is there a way to accept (move to the other side) one or selected lines and not the whole block? Currently have to copy paste.
2-is there a way to add empty imaginary lines and make corresponding lines at the same Level(like most diff programs ex: beyond compare). It’s pretty annoying to look up and down for corresponding lines where the blocks don’t have the same number of lines.