From 7af8eb4a80b031f80ce39ac2b89132770ed27a35 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 17 Dec 2008 13:07:47 -0800
Subject: [PATCH] IGN:...

---
 src/calibre/trac/plugins/Changelog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/trac/plugins/Changelog.py b/src/calibre/trac/plugins/Changelog.py
index 05f1b4456f..8d02ebdd73 100644
--- a/src/calibre/trac/plugins/Changelog.py
+++ b/src/calibre/trac/plugins/Changelog.py
@@ -17,7 +17,7 @@ BZR_PATH = '/var/bzr/code/calibre/trunk'
 class ChangelogFormatter(blog.LogFormatter):
     
     supports_tags = True
-    supports_merge_revisions = True
+    supports_merge_revisions = False
     
     def __init__(self, num_of_versions=20):
         self.num_of_versions = num_of_versions