summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: df9f91f)
raw | patch | inline | side by side (parent: df9f91f)
author | Steffen Prohaska <prohaska@zib.de> | |
Wed, 16 May 2007 05:48:47 +0000 (07:48 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 16 May 2007 19:32:29 +0000 (12:32 -0700) |
link to git-mergetool was broken.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/user-manual.txt | patch | blob | history |
index 13db9699c1b7daceaa7fa932972d809e52eb1f42..dd1578dc8d7fd7ef0a965e15d352023f95f19b20 100644 (file)
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: