diff contrib/simplemerge @ 14768:55db12e54450 stable

color: fix TypeError with auto mode on win32 when colors aren't available (issue2871) This can happen when stdout isn't a terminal (e.g., it's being piped).
author Brodie Rao <brodie@bitheap.org>
date Wed, 29 Jun 2011 13:20:39 -0400
parents 659f34b833b9
children cba222f01056
line wrap: on
line diff