git-merge-file(1) on Linux
The text 6bdfbac7dc52, as Debian 7 (Wheezy) shipped it.
Run a three-way file merge
Flags it lists
-
--ours -
--theirs -
--union -
-L -
-p -
-q