summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorSteffen Prohaska <prohaska@zib.de>2007-05-16 05:48:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-16 19:32:29 (GMT)
commit61d7256431da590dfca689e0681ed9437fd5d448 (patch)
tree32656606867262acc2bee4b5c2115de45ac636e4 /Documentation
parentdf9f91f8738167becda7a80f0db0ba856cdc0ecb (diff)
downloadgit-61d7256431da590dfca689e0681ed9437fd5d448.zip
git-61d7256431da590dfca689e0681ed9437fd5d448.tar.gz
git-61d7256431da590dfca689e0681ed9437fd5d448.tar.bz2
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/user-manual.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 13db969..dd1578d 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1357,7 +1357,7 @@ $ gitk --merge
These will display all commits which exist only on HEAD or on
MERGE_HEAD, and which touch an unmerged file.
-You may also use gitlink:git-mergetool, which lets you merge the
+You may also use gitlink:git-mergetool[1], which lets you merge the
unmerged files using external tools such as emacs or kdiff3.
Each time you resolve the conflicts in a file and update the index: