summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/2.12.0.txt
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2017-06-25 10:20:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-27 17:35:49 (GMT)
commit64127575149e35b409bc2f78962f86507346d604 (patch)
tree3287f694ee01dfabdcab849c10fd90947a0ca531 /Documentation/RelNotes/2.12.0.txt
parente0aaa1b6532cfce93d87af9bc813fb2e7a7ce9d7 (diff)
downloadgit-64127575149e35b409bc2f78962f86507346d604.zip
git-64127575149e35b409bc2f78962f86507346d604.tar.gz
git-64127575149e35b409bc2f78962f86507346d604.tar.bz2
Spelling fixes
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 2915480..ef8b97d 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.