sdiff

sdiff#

Side-by-side diff with optional interactive merge.

$ sdiff a b
$ sdiff -o merged a b