git-merge documentation: describe how conflict is presented

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 05cbac56aced6ad27f36fe63f8f536e794794f9f..0446bad7e589c06c97bb9274e9edd4b343ef9e55 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -41,10 +41,10 @@ include::diff-options.txt[]
        Print out the ref names of any commits that are shown.
 
 --full-diff::
-       Without this flag, "git log -p <paths>..." shows commits that
+       Without this flag, "git log -p <path>..." shows commits that
        touch the specified paths, and diffs about the same specified
        paths.  With this, the full diff is shown for commits that touch
-       the specified paths; this means that "<paths>..." limits only
+       the specified paths; this means that "<path>..." limits only
        commits, and doesn't limit diff for those commits.
 
 --follow::
@@ -57,7 +57,7 @@ include::diff-options.txt[]
        Note that only message is considered, if also a diff is shown
        its size is not included.
 
-<paths>...::
+<path>...::
        Show only commits that affect any of the specified paths.