git-merge documentation: describe how conflict is presented

diff --git a/Documentation/git-lost-found.txt b/Documentation/git-lost-found.txt
index 7f808fcd767993a60fb96a2876475e696a0f5900..602b8d5d4de8f7649cb88e6622108c012f484933 100644 (file)
--- a/Documentation/git-lost-found.txt
+++ b/Documentation/git-lost-found.txt
@@ -7,12 +7,12 @@ git-lost-found - Recover lost refs that luckily have not yet been pruned
 
 SYNOPSIS
 --------
-'git-lost-found'
+'git lost-found'
 
 DESCRIPTION
 -----------
 
-*NOTE*: this command is deprecated.  Use gitlink:git-fsck[1] with
+*NOTE*: this command is deprecated.  Use linkgit:git-fsck[1] with
 the option '--lost-found' instead.
 
 Finds dangling commits and tags from the object database, and
@@ -78,4 +78,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite