0.12dev: ported svnmerge.py properties rendering fix from 0.11-stable
Authored by: cboos 2009-07-26
Parent: [r8370]
Child: [r8372]