index fc1b03002651d168ed068adeec0475f870f46f16..fedcfa0543fa9f7d44c2c53eedc9258d6eb8de43 100644 (file)
-----------
Use `git mergetool` to run one of several merge utilities to resolve
-merge conflicts. It is typically run after linkgit:git-merge[1].
+merge conflicts. It is typically run after `git-merge`.
If one or more <file> parameters are given, the merge tool program will
be run to resolve differences on each file. If no <file> names are