From: Steffen Prohaska Date: Wed, 16 May 2007 05:48:47 +0000 (+0200) Subject: Fixed link in user-manual X-Git-Tag: v1.5.1.5~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/61d7256431da590dfca689e0681ed9437fd5d448?ds=inline;hp=--cc Fixed link in user-manual link to git-mergetool was broken. Signed-off-by: Steffen Prohaska Signed-off-by: Junio C Hamano --- 61d7256431da590dfca689e0681ed9437fd5d448 diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 13db9699c1..dd1578dc8d 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: