diff mercurial/unionrepo.py @ 19234:7bbad79b9542

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 23 May 2013 17:52:21 -0500
parents a9c443b3b240
children bb67f630b335
line wrap: on
line diff