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