imediff2(1) on Linux
The text b7e3f451dc86, as Debian 9 (Stretch), Debian 8 (Jessie), Debian 7 (Wheezy), Debian 6.0 (Squeeze), Debian 5.0 (Lenny), Debian 4.0 (Etch) shipped it.
An interactive fullscreen 2-way merge tool
Flags it lists
-
--help -
--mono -
--new-file -
--output -
--unresolved -
--version -
-N -
-V -
-a -
-b -
-c -
-h -
-m -
-o -
-u