diff mercurial/unionrepo.py @ 27431:8f016345e6b0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 18 Dec 2015 14:40:11 -0600
parents 56b2bcea2529
children 12f727a5b434 bf86e3e87123
line wrap: on
line diff