Merge branch 'ph/maint-quiltimport' into maint

[git.git] / Documentation / git-merge-file.txt

diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 0b41d66a70dd7e36854bcc10706202bd4e1880a1..c513184ba07ae83073232cc54a0007a3cda66412 100644 (file)
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -1,9 +1,9 @@
 git-merge-file(1)
-============
+=================
 
 NAME
 ----
-git-merge-file - threeway file merge
+git-merge-file - Run a three-way file merge
 
 
 SYNOPSIS
@@ -41,7 +41,7 @@ conflicts otherwise. If the merge was clean, the exit value is 0.
 
 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
@@ -89,4 +89,4 @@ with parts copied from the original documentation of RCS merge.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite