git-merge(1) on Linux
The text f65d4e4136bc, as Debian 4.0 (Etch) shipped it.
Grand Unified Merge Driver
Flags it lists
-
--no-commit -
--no-summary -
--squash -
--strategy -
-n -
-s