git-mergetool(1) on Linux
The text 861042e47684, as Debian 6.0 (Squeeze) shipped it.
Run merge conflict resolution tools to resolve merge conflicts
Flags it lists
-
--no-prompt -
--prompt -
--tool -
-t -
-y