diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-01-07 07:55:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-01-07 07:55:46 +0000 |
| commit | 35738e87105e1a11ced6a6b497146bbd189d4fb2 (patch) | |
| tree | 352f4473f85ea0e327b3a0e3b9739d80f8462eb9 /git-mergetool.txt | |
| parent | 14b76487ff861981455b320a2c6d17632997773e (diff) | |
| download | git-htmldocs-35738e87105e1a11ced6a6b497146bbd189d4fb2.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc2-60-gb2e62
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index a26c26016..50f106ec5 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -13,7 +13,7 @@ DESCRIPTION ----------- Use 'git mergetool' to run one of several merge utilities to resolve -merge conflicts. It is typically run after gitlink:git-merge[1]. +merge conflicts. It is typically run after linkgit:git-merge[1]. If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file. If no <file> names are @@ -48,4 +48,4 @@ Documentation by Theodore Y Ts'o. GIT --- -Part of the gitlink:git[7] suite +Part of the linkgit:git[7] suite |