diff MoinMoin/PageGraphicalEditor.py @ 785:f3c1ea6ef86e

Refactored conflict messages, removed link to diff because it is not necessary for a 3-way merge.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Sun, 04 Jun 2006 23:14:13 +0200
parents 9834dda36973
children 9d74a2f53323
line wrap: on
line diff
--- a/MoinMoin/PageGraphicalEditor.py	Sun Jun 04 23:00:23 2006 +0200
+++ b/MoinMoin/PageGraphicalEditor.py	Sun Jun 04 23:14:13 2006 +0200
@@ -124,11 +124,7 @@
                 conflict_msg = _('Someone else changed this page while you were editing!')
                 if self.mergeEditConflict(rev):
                     conflict_msg = _("""Someone else saved this page while you were editing!
-Please review the page and save then. Do not save this page as it is!
-Have a look at the diff of %(difflink)s to see what has been changed.""") % {
-                        'difflink': self.link_to(self.request,
-                                                 querystr='action=diff&rev=%d' % rev)
-                        }
+Please review the page and save then. Do not save this page as it is!""")
                     rev = self.current_rev()
             if conflict_msg:
                 # We don't show preview when in conflict