index 29d3faa556f8e7148edd9f01d1ffa870e78502b8..149f1310519bb5b732fca0926f786f80a153f8da 100644 (file)
NAME
----
-git-merge-file - three-way file merge
+git-merge-file - Run a three-way file merge
SYNOPSIS
git-merge-file is designed to be a minimal clone of RCS merge, that is, it
implements all of RCS merge's functionality which is needed by
-gitlink:git[1].
+linkgit:git[1].
OPTIONS
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite