git-merge-file(1) on Linux
The text 22692eb667fe, as Arch Linux 2026-11-01 shipped it. The page shows this text now.
Run a three-way file merge
Flags it lists
-
--diff-algorithm -
--diff3 -
--object-id -
--ours -
--theirs -
--union -
--zdiff3 -
-L -
-p -
-q