From: Steffen Prohaska Date: Wed, 16 May 2007 05:48:47 GMT Subject: [PATCH] Fixed link in user-manual Message-ID: <1179294527336-git-send-email-prohaska@zib.de> link to git-mergetool was broken. Signed-off-by: Steffen Prohaska --- Documentation/user-manual.txt | 2 +- 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: -- 1.5.1.2