about summary refs log tree commit diff
path: root/third_party/git/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/Documentation/merge-strategies.txt')
-rw-r--r--third_party/git/Documentation/merge-strategies.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/Documentation/merge-strategies.txt b/third_party/git/Documentation/merge-strategies.txt
index aa66cbe41eaf..2912de706bf3 100644
--- a/third_party/git/Documentation/merge-strategies.txt
+++ b/third_party/git/Documentation/merge-strategies.txt
@@ -32,7 +32,7 @@ The 'recursive' strategy can take the following options:
 ours;;
 	This option forces conflicting hunks to be auto-resolved cleanly by
 	favoring 'our' version.  Changes from the other tree that do not
-	conflict with our side are reflected to the merge result.
+	conflict with our side are reflected in the merge result.
 	For a binary file, the entire contents are taken from our side.
 +
 This should not be confused with the 'ours' merge strategy, which does not