Skip to content

Commit

Permalink
Fixed link in user-manual
Browse files Browse the repository at this point in the history 
link to git-mergetool was broken.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Steffen Prohaska authored and Junio C Hamano committed May 16, 2007
1 parent df9f91f commit 61d7256
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/user-manual.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 61d7256

Please sign in to comment.