git-merge-file(1) on Linux
The text a21c5fa0aa5a, as Debian 8 (Jessie) shipped it.
Run a three-way file merge
Flags it lists
-
--diff3 -
--ours -
--theirs -
--union -
-L -
-p -
-q