diff mercurial/unionrepo.py @ 27408:2916ebaef312

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 17 Dec 2015 17:27:32 -0600
parents 56b2bcea2529
children 12f727a5b434 bf86e3e87123
line wrap: on
line diff