* [PATCH] Fixed link in user-manual
@ 2007-05-16 5:48 Steffen Prohaska
0 siblings, 0 replies; only message in thread
From: Steffen Prohaska @ 2007-05-16 5:48 UTC (permalink / raw)
To: git; +Cc: Steffen Prohaska
link to git-mergetool was broken.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-05-16 5:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-16 5:48 [PATCH] Fixed link in user-manual Steffen Prohaska
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).