diff mercurial/discovery.py @ 19327:cf1b0a58a0de

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Jun 2013 15:31:40 -0500
parents f3b21beb9802
children b00ba31313c3
line wrap: on
line diff