kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

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>
maint
Steffen Prohaska 18 years ago committed by Junio C Hamano
parent
df9f91f873
commit
61d7256431
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Documentation/user-manual.txt

2
Documentation/user-manual.txt
Unescape View File

@ -1357,7 +1357,7 @@ $ gitk --merge
These will display all commits which exist only on HEAD or on These will display all commits which exist only on HEAD or on
MERGE_HEAD, and which touch an unmerged file. 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. unmerged files using external tools such as emacs or kdiff3.


Each time you resolve the conflicts in a file and update the index: Each time you resolve the conflicts in a file and update the index:

Write Preview
Loading…
Cancel
Save