Merge branch 'en/merge-options-ff-and-friends'

diff --git a/Documentation/RelNotes/1.8.2.2.txt b/Documentation/RelNotes/1.8.2.2.txt
index dab4831ca03a4f54489fa2371f085f6078824b1c..708df1ae196cfe318d44bc4ac445f27d994d79e1 100644 (file)
--- a/Documentation/RelNotes/1.8.2.2.txt
+++ b/Documentation/RelNotes/1.8.2.2.txt
@@ -58,4 +58,4 @@ Fixes since v1.8.2.1
    conflicts have been applied.
 
  * "git bundle" did not like a bundle created using a commit without
-   any message as its one of the prerequistes.
+   any message as its one of the prerequisites.