diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-16 23:43:05 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-16 23:43:05 +0400 |
| commit | fdcb769916c93b53517ef1b4cae447a3333c9b86 (patch) | |
| tree | 15900032ae854c16292e8d8e0b5d1f089b5c8263 /Documentation/user-manual.txt | |
| parent | 7e431ef9ab933d7ff899a999e40627ab49774f3a (diff) | |
| parent | 0ab564be6e59c66c7aa4fc44997f3fc62ebcd0d9 (diff) | |
Merge branch 'maint'
* maint:
format-patch: add MIME-Version header when we add content-type.
Fixed link in user-manual
import-tars: Use the "Link indicator" to identify directories
git name-rev writes beyond the end of malloc() with large generations
Documentation/branch: fix small typo in -D example
Diffstat (limited to 'Documentation/user-manual.txt')
| -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 a7abeaa1d7..8d66886335 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: |