diff mercurial/unionrepo.py @ 21751:c5699c2d690b

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 13 Jun 2014 17:42:04 -0500
parents 49f2d5644f04
children 37a92908a382
line wrap: on
line diff