merge-options.txt: clarify meaning of various ff-related options

diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt
index 35e8da201005dee34b75c87aebf720a8f7300a9c..6926e0a4c86a0c8396d9cca4942a81bbb8e7dc85 100644 (file)
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@ -11,7 +11,7 @@ Git internal format::
        It is `<unix timestamp> <time zone offset>`, where `<unix
        timestamp>` is the number of seconds since the UNIX epoch.
        `<time zone offset>` is a positive or negative offset from UTC.
-       For example CET (which is 2 hours ahead UTC) is `+0200`.
+       For example CET (which is 1 hour ahead of UTC) is `+0100`.
 
 RFC 2822::
        The standard email format as described by RFC 2822, for example