diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-10 16:42:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-10 16:42:27 -0700 |
| commit | 58700665185d6fc310aa6d6616ba3bec0105342d (patch) | |
| tree | 7c36d0aadaf906e5057fecd87331d7ff52ea753d /git-mergetool.txt | |
| parent | 8fb66e5074d5cdeeb08e304be977374501a0787d (diff) | |
| download | git-htmldocs-58700665185d6fc310aa6d6616ba3bec0105342d.tar.gz | |
Autogenerated HTML docs for v1.7.7-213-g8b0e1
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 347091010..2a49de7cf 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -17,9 +17,10 @@ Use `git mergetool` to run one of several merge utilities to resolve 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 -specified, 'git mergetool' will run the merge tool program on every file -with merge conflicts. +be run to resolve differences on each file (skipping those without +conflicts). Specifying a directory will include all unresolved files in +that path. If no <file> names are specified, 'git mergetool' will run +the merge tool program on every file with merge conflicts. OPTIONS ------- |