diff options
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index fc1b030026..fedcfa0543 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/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 linkgit:git-merge[1]. +merge conflicts. It is typically run after `git-merge`. 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 |