index 31882abb870b9720b2e7343638ef1c92eed8b2d9..149f1310519bb5b732fca0926f786f80a153f8da 100644 (file)
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