Fixed link in user-manual
link to git-mergetool was broken. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Steffen Prohaska committed
May 16, 2007 at 07:48 UTC
61d7256431da590dfca689e0681ed9437fd5d448
1 file changed
+1
-1
Documentation/user-manual.txt
+1
-1
@@ -1357,7 +1357,7 @@ $ gitk --merge
1357
These will display all commits which exist only on HEAD or on
1358
MERGE_HEAD, and which touch an unmerged file.
1359
1360
-You may also use gitlink:git-mergetool, which lets you merge the
1360
+You may also use gitlink:git-mergetool[1], which lets you merge the
1361
unmerged files using external tools such as emacs or kdiff3.
1362
1363
Each time you resolve the conflicts in a file and update the index: