comparison mercurial/scmwindows.py @ 27431:8f016345e6b0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 18 Dec 2015 14:40:11 -0600
parents adae8928fe09
children 029f02757c20
comparison
equal deleted inserted replaced
27429:2e31a17ad1bf 27431:8f016345e6b0