Merge branch 'sp/test-i18ngrep' into maint-2.43

[thirdparty/git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 1a75c28bca909a9a7ba7883bd9cf16c0d4bbac5b..53ec3c9a3476bd12b8a8f4b6c31552b2767d8366 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -76,7 +76,7 @@ off, none::
 +
 on, m::
        Make diff output for merge commits to be shown in the default
-       format. The default format could be changed using
+       format. The default format can be changed using
        `log.diffMerges` configuration variable, whose default value
        is `separate`.
 +
@@ -314,7 +314,7 @@ ifndef::git-format-patch[]
 
 -z::
 ifdef::git-log[]
-       Separate the commits with NULs instead of with new newlines.
+       Separate the commits with NULs instead of newlines.
 +
 Also, when `--raw` or `--numstat` has been given, do not munge
 pathnames and use NULs as output field terminators.