From 9a9fd289cc81a3bb69eb2b4e11db27509e0eb515 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sun, 8 Oct 2023 06:45:20 +0000 Subject: documentation: use clearer prepositions Diff best viewed with --color-diff. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- Documentation/git-mergetool.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-mergetool.txt') 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 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 names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts. -- cgit v1.3-5-g9baa