summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/2.12.0.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/RelNotes/2.12.0.txt')
-rw-r--r--Documentation/RelNotes/2.12.0.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.txt
index 29154805b4..ef8b97da9b 100644
--- a/Documentation/RelNotes/2.12.0.txt
+++ b/Documentation/RelNotes/2.12.0.txt
@@ -264,7 +264,7 @@ notes for details).
needed it so far.
* Git 2.11 had a minor regression in "merge --ff-only" that competed
- with another process that simultanously attempted to update the
+ with another process that simultaneously attempted to update the
index. We used to explain what went wrong with an error message,
but the new code silently failed. The error message has been
resurrected.