diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
| commit | 9a9fd289cc81a3bb69eb2b4e11db27509e0eb515 (patch) | |
| tree | 613ec5217e16120fa374f5c60cc815db770e0245 /Documentation/git-mergetool.txt | |
| parent | 0cac690e1ac5e26ecf2dba0c53ac3824425446b5 (diff) | |
| download | git-9a9fd289cc81a3bb69eb2b4e11db27509e0eb515.tar.gz | |
documentation: use clearer prepositions
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 800a3cbe6f..7b7b6f8f34 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -17,7 +17,7 @@ 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 (skipping those without +be run to resolve differences in 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. |