diff mercurial/simplemerge.py @ 10831:441f5d66da03

color: concatenate effects correctly and avoid printing empty effects
author Brodie Rao <brodie@bitheap.org>
date Sun, 04 Apr 2010 22:53:50 -0500
parents 08a0f04b56bd
children 81c4e18c7cee
line wrap: on
line diff