diff mercurial/util.py @ 13213:3eee7b42d17e

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 29 Dec 2010 14:19:44 -0600
parents 91bc001a592f 5d0a30fad7de
children d18a748d9c33
line wrap: on
line diff