summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes-1.6.5.4.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/RelNotes-1.6.5.4.txt')
-rw-r--r--Documentation/RelNotes-1.6.5.4.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/RelNotes-1.6.5.4.txt b/Documentation/RelNotes-1.6.5.4.txt
index e42f8b2397..d3a2a3e712 100644
--- a/Documentation/RelNotes-1.6.5.4.txt
+++ b/Documentation/RelNotes-1.6.5.4.txt
@@ -26,7 +26,7 @@ Fixes since v1.6.5.3
future versions, but not in this release,
* "git merge -m <message> <branch>..." added the standard merge message
- on its own after user-supplied message, which should have overrided the
+ on its own after user-supplied message, which should have overridden the
standard one.
Other minor documentation updates are included.