git-apply: try threeway first when "--3way" is used

[thirdparty/git.git] / Documentation / git-apply.txt

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 91d9a8601c8c316d4649c405af42e531c39991a8..9144575299c264dd299b542b7b5948eef35f211c 100644 (file)
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -84,9 +84,8 @@ OPTIONS
 
 -3::
 --3way::
-       When the patch does not apply cleanly, fall back on 3-way merge if
-       the patch records the identity of blobs it is supposed to apply to,
-       and we have those blobs available locally, possibly leaving the
+       Attempt 3-way merge if the patch records the identity of blobs it is supposed
+       to apply to and we have those blobs available locally, possibly leaving the
        conflict markers in the files in the working tree for the user to
        resolve.  This option implies the `--index` option, and is incompatible
        with the `--reject` and the `--cached` options.