git-merge-file(1) on Linux
The text 20946bbf05c3, as Debian 5.0 (Lenny) shipped it.
Run a three-way file merge
Flags it lists
-
-L -
-p -
-q
The text 20946bbf05c3, as Debian 5.0 (Lenny) shipped it.
Run a three-way file merge
-L
-p
-q