diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-05-16 22:46:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-05-16 22:46:31 +0000 |
| commit | ec47dcf7fe32258d5e13e85ae6fe91061f1746f4 (patch) | |
| tree | 194d1e4409191af7c25fd1048faa0c2f870c3e82 /user-manual.txt | |
| parent | 0430e3a874bf1f6935be905e8539d77d41f48a62 (diff) | |
| download | git-htmldocs-ec47dcf7fe32258d5e13e85ae6fe91061f1746f4.tar.gz | |
Autogenerated HTML docs for v1.5.2-rc3-50-gfdcb7
Diffstat (limited to 'user-manual.txt')
| -rw-r--r-- | user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user-manual.txt b/user-manual.txt index a7abeaa1d..8d6688633 100644 --- a/user-manual.txt +++ b/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: |