diff tests/test-simplemerge-cmd.out @ 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 e1f4343db740
children
line wrap: on
line diff