log: handle integer overflow in timestamps

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 42391f2ae76aa579605470b6cad8cf4812f29aae..e07337592ae5c4dca30bca770f55e4096ce1df6d 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -187,11 +187,11 @@ In such a case, you can "unwrap" the tag yourself before feeding it
 to `git merge`, or pass `--ff-only` when you do not have any work on
 your own. e.g.
 
----
+----
 git fetch origin
 git merge v1.2.3^0
 git merge --ff-only v1.2.3
----
+----
 
 
 HOW CONFLICTS ARE PRESENTED