diff mercurial/filemerge.py @ 9037:a232b90ffb51

compat: remove unnecessary diamond-shaped multiple inheritance
author Alejandro Santos <alejolp@alejolp.com>
date Sun, 05 Jul 2009 11:06:41 +0200
parents 90f74b31ed4f
children 86b4a9b0ddda
line wrap: on
line diff