diff options
| author |  Steffen Prohaska <prohaska@zib.de> | 2007-05-16 07:48:47 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-05-16 12:32:29 -0700 |
| commit | 61d7256431da590dfca689e0681ed9437fd5d448 (patch) | |
| tree | 32656606867262acc2bee4b5c2115de45ac636e4 | |
| parent | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint (diff) | |
| download | tgif-61d7256431da590dfca689e0681ed9437fd5d448.tar.xz | |
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>
| -rw-r--r-- | 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 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: |